Merge branch 'release/1.8.0'

pluginsGLPI · Jun 28, 2018 · 9406eea · 9406eea
2 parents d0e03ac + cb6d35b
commit 9406eea
Show file tree

Hide file tree

Showing 33 changed files with 938 additions and 964 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,14 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - nightly
 
 env:
   global:
     - DB=mysql
   matrix:
-     #- GLPIVER=9.1.2 ==> not released yet!
-    - GLPIVER=9.2/bugfixes
+    - GLPIVER=9.3/bugfixes
 
 before_script:
   - composer self-update

diff --git a/.tx/config b/.tx/config
@@ -1,8 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[glpi-plugin-plugin-fields.fieldspot]
+[glpi-plugin-plugin-fields.fields-pot]
 file_filter = locales/<lang>.po
 source_file = locales/fields.pot
 source_lang = en
-
+type = PO
diff --git a/composer.json b/composer.json
@@ -1,17 +1,15 @@
 {
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "require-dev": {
-        "glpi-project/tools": "^0.1.0",
+        "glpi-project/tools": "^0.1",
         "atoum/atoum": "^3.1"
     },
     "require": {
-        "php": ">=5.6.0"
+        "php": ">=5.6"
     },
     "config": {
         "optimize-autoloader": true,
         "platform": {
-            "php": "5.6.0"
+            "php": "5.6"
         }
     }
 }