Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Jul 7, 2020
2 parents f119065 + 160aad8 commit 952cb5f
Show file tree
Hide file tree
Showing 50 changed files with 6,221 additions and 1,814 deletions.
44 changes: 4 additions & 40 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,15 @@
language: php
php:
- 5.5
- 5.6
- 7.0
- 7.1
- nightly

#env:
# global:
# - DB=mysql
# matrix:
# - GLPIVER=9.1/bugfixes
# - GLPIVER=master
- 7.2
- 7.4

before_script:
- composer self-update
# - git clone --depth=1 https://github.com/glpi-project/glpi -b $GLPIVER ../glpi && cd ../glpi
# - composer install --no-dev
# - mysql -u root -e 'create database glpitest;'
# - php tools/cliinstall.php --db=glpi-test --user=travis --tests
# - mv ../xivo plugins/{LNAME}
# - cd plugins/xivo
- composer install -o

- composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest

script:
- vendor/bin/robo --no-interaction code:cs
# - mysql -u root -e 'select version();'
# - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/


matrix:
# exclude:
# - php: 5.4
# env: GLPIVER=master
allow_failures:
- php: nightly
- vendor/bin/robo --no-interaction code:cs --strict

cache:
directories:
- $HOME/.composer/cache

#notifications:
# irc:
# channels:
# - "irc.freenode.org#channel"
# on_success: change
# on_failure: always
# use_notice: true
# skip_join: true
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Here is the list of currently working/planned features:

- [x] Phones inventory
- [x] Lines inventory
- [x] Users presence
- [x] Users presence (since xivo deneb version)
- [x] Auto-open tickets or users form
- [x] Click2Call (requires xivo client to handle `callto:` links)
- [ ] Call logs
Expand All @@ -18,8 +18,7 @@ Please contact [Teclib'](http://www.teclib-group.com) by [mail](http://www.tecli

## Configuration

This plugin was tested with xivo versions [16.12, 2018.05.03] and should work correctly for versions above 16.04.
Also not tested at all, but the plugin should also work with recent xivo forks.
This plugin was tested with xivo versions [16.12, 2018.05.03, 2019.12.03] and should work correctly for versions above 16.04.

### Inventory

Expand Down
5 changes: 4 additions & 1 deletion RoboFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@

class RoboFile extends Glpi\Tools\RoboFile
{
//Own plugin's robo stuff
public function __construct() {
$this->csignore[] = '/js/store2.min.js';
$this->csignore[] = '/js/xivo/';
}
}
16 changes: 11 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
{
"minimum-stability": "dev",
"prefer-stable": true,
"require-dev": {
"glpi-project/tools": "^0.1.0"
},
"require": {
"php": "^7.2",
"guzzlehttp/guzzle": "^6.2"
},
"require-dev": {
"glpi-project/tools": "^0.1"
},
"config": {
"optimize-autoloader": true,
"platform": {
"php": "7.2.0"
},
"sort-packages": true
}
}
Loading

0 comments on commit 952cb5f

Please sign in to comment.