Skip to content

Commit 5649361

Browse files
committed
Merge branch 'release/1.4.0'
2 parents 62c0242 + cb7bb0b commit 5649361

35 files changed

+1023
-685
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 5.5
43
- 5.6
54
- 7.0
65
- 7.1

.tx/config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[glpi-plugin-news.glpipot-8]
4+
[glpi-plugin-news.news-pot]
55
file_filter = locales/<lang>.po
6-
source_file = locales/glpi.pot
6+
source_file = locales/news.pot
77
source_lang = en
8-
8+
type = PO

ajax/targets.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@
3434
echo "<td>";
3535
switch ($_POST['type']) {
3636
case 'User' :
37-
User::dropdown(array('name' => 'items_id',
38-
'right' => 'all',
39-
'entity' => $_POST['entities_id'],
40-
'entity_sons' => $_POST['is_recursive'],));
37+
User::dropdown(['name' => 'items_id',
38+
'right' => 'all',
39+
'entity' => $_POST['entities_id'],
40+
'entity_sons' => $_POST['is_recursive'],]);
4141
break;
4242

4343
case 'Group' :
44-
Group::dropdown(array('name' => 'items_id'));
44+
Group::dropdown(['name' => 'items_id']);
4545
break;
4646

4747
case 'Profile' :
48-
Profile::dropdown(array('name' => 'items_id',
49-
'toadd' => array(-1 => __('All'))));
48+
Profile::dropdown(['name' => 'items_id',
49+
'toadd' => [-1 => __('All')]]);
5050
break;
5151
}
5252
echo "</td>";

composer.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
2-
"minimum-stability": "dev",
3-
"prefer-stable": true,
42
"require-dev": {
5-
"glpi-project/tools": "^0.1.0"
3+
"glpi-project/tools": "^0.1"
4+
},
5+
"config": {
6+
"platform": {
7+
"php": "5.6"
8+
}
69
}
710
}

0 commit comments

Comments
 (0)