From 5db035df59e915822ba7c975aebcbc886f96caec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 4 May 2018 14:53:16 +0200 Subject: [PATCH 1/7] Use new methods for search options --- inc/tag.class.php | 116 ++++++++++++++++++++++++++++------------------ setup.php | 4 +- 2 files changed, 72 insertions(+), 48 deletions(-) diff --git a/inc/tag.class.php b/inc/tag.class.php index fac83ff..074dcfb 100644 --- a/inc/tag.class.php +++ b/inc/tag.class.php @@ -235,56 +235,80 @@ function haveChildren() { return true; } - function getSearchOptions() { - $tab = []; - - $tab['common'] = __('Characteristics'); - - $tab[1]['table'] = $this->getTable(); - $tab[1]['field'] = 'name'; - $tab[1]['name'] = __('Name'); - $tab[1]['massiveaction'] = true; - $tab[1]['datatype'] = 'itemlink'; - - $tab[2]['table'] = $this->getTable(); - $tab[2]['field'] = 'comment'; - $tab[2]['name'] = __('Description'); - $tab[2]['massiveaction'] = true; - $tab[2]['datatype'] = 'string'; - - $tab[3]['table'] = $this->getTable(); - $tab[3]['field'] = 'id'; - $tab[3]['name'] = __('ID'); - $tab[3]['massiveaction'] = false; - $tab[3]['datatype'] = 'number'; - - $tab[4]['table'] = 'glpi_entities'; - $tab[4]['field'] = 'completename'; - $tab[4]['linkfield'] = 'entities_id'; - $tab[4]['name'] = __('Entity'); - $tab[4]['datatype'] = 'dropdown'; - - $tab[5]['table'] = $this->getTable(); - $tab[5]['field'] = 'is_recursive'; - $tab[5]['name'] = __('Child entities'); - $tab[5]['datatype'] = 'bool'; - - $tab[6]['table'] = $this->getTable(); - $tab[6]['field'] = 'type_menu'; - $tab[6]['searchtype'] = ['equals', 'notequals']; - $tab[6]['name'] = _n('Associated item type', 'Associated item types', 2); - $tab[6]['datatype'] = 'specific'; - - $tab[7]['table'] = $this->getTable(); - $tab[7]['field'] = 'color'; - $tab[7]['name'] = __('HTML color', 'tag'); - $tab[7]['searchtype'] = 'contains'; - $tab[7]['datatype'] = 'specific'; + function rawSearchOptions() { + + $tab = []; + + $tab[] = [ + 'id' => 'common', + 'name' => __('Characteristics'), + ]; + + $tab[] = [ + 'id' => 1, + 'table' => $this->getTable(), + 'field' => 'name', + 'name' => __('Name'), + 'datatype' => 'itemlink', + 'massiveaction' => true, + ]; + + $tab[] = [ + 'id' => 2, + 'table' => $this->getTable(), + 'field' => 'comment', + 'name' => __('Description'), + 'datatype' => 'string', + 'massiveaction' => true, + ]; + + $tab[] = [ + 'id' => 3, + 'table' => $this->getTable(), + 'field' => 'id', + 'name' => __('ID'), + 'datatype' => 'number', + 'massiveaction' => false, + ]; + + $tab[] = [ + 'id' => 4, + 'table' => 'glpi_entities', + 'field' => 'completename', + 'linkfield' => 'entities_id', + 'name' => __('Entity'), + 'datatype' => 'dropdown', + ]; + + $tab[] = [ + 'id' => 5, + 'table' => $this->getTable(), + 'field' => 'is_recursive', + 'name' => __('Child entities'), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => 6, + 'table' => $this->getTable(), + 'field' => 'type_menu', + 'name' => _n('Associated item type', 'Associated item types', 2), + 'searchtype' => ['equals', 'notequals'], + 'datatype' => 'specific', + ]; + + $tab[] = [ + 'id' => 7, + 'table' => $this->getTable(), + 'field' => 'color', + 'name' => __('HTML color', 'tag'), + 'searchtype' => 'contains', + 'datatype' => 'specific', + ]; return $tab; } - static function getSpecificValueToSelect($field, $name='', $values='', array $options=array()) { if (!is_array($values)) { $values = [$field => $values]; diff --git a/setup.php b/setup.php index ad11707..53f0d93 100644 --- a/setup.php +++ b/setup.php @@ -29,9 +29,9 @@ define ('PLUGIN_TAG_VERSION', '2.1.2'); // Minimal GLPI version, inclusive -define("PLUGIN_TAG_MIN_GLPI", "9.2"); +define("PLUGIN_TAG_MIN_GLPI", "9.3"); // Maximum GLPI version, exclusive -define("PLUGIN_TAG_MAX_GLPI", "9.3"); +define("PLUGIN_TAG_MAX_GLPI", "9.4"); /** * Check configuration process From 4f7305f56fe07524238143c5847c37505f840bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 4 May 2018 16:20:52 +0200 Subject: [PATCH 2/7] Upgrade tag selection to select2 v4 --- css/tag.css | 2 +- inc/tag.class.php | 55 ++++++++++++++++++++++++++----------------- inc/tagitem.class.php | 12 +++++----- js/common.js | 2 +- 4 files changed, 41 insertions(+), 30 deletions(-) diff --git a/css/tag.css b/css/tag.css index b412596..2e478b8 100644 --- a/css/tag.css +++ b/css/tag.css @@ -35,7 +35,7 @@ } .tag_choice { - padding: 3px 4px 6px 2px; + padding: 3px; border-radius: 3px; } diff --git a/inc/tag.class.php b/inc/tag.class.php index 074dcfb..1073739 100644 --- a/inc/tag.class.php +++ b/inc/tag.class.php @@ -474,28 +474,34 @@ static function showTagDropdown($params = []) { } // found existing tags - $select2_tags = array_values(array_map(function($value) { - return [ - 'id' => $value['id'], - 'text' => $value['name'], - 'color' => $value['color'], + $existing_tags = $tag->find($where, 'name'); + $select2_tags = []; + foreach ($existing_tags as $existing_tag) { + $select2_tags[] = [ + 'id' => $existing_tag['id'], + 'text' => $existing_tag['name'], + 'color' => $existing_tag['color'], + 'selected' => in_array($existing_tag['id'], $values), ]; - }, $tag->find($where, 'name'))); + } // create an input receiving the tag tokens $rand = mt_rand(); - echo Html::input('_plugin_tag_tag_values', [ - 'id' => "tag_select_$rand", - 'value' => implode(',', $values), - 'class' => 'tag_select', - 'multiple' => 'multiple', - ]); + echo Html::select( + '_plugin_tag_tag_values[]', + [], + [ + 'id' => "tag_select_$rand", + 'class' => 'tag_select', + 'multiple' => 'multiple', + ] + ); $token_creation = " // prefix value by 'newtag_' to differenciate created tag from existing ones - return { id: 'newtag_'+term, text: term };"; + return { id: 'newtag_'+ params.term, text: params.term };"; if (!self::canCreate()) { - $token_creation = "return false;"; + $token_creation = "return null;"; } $readOnly = $obj->isNewItem() ? !$obj->canCreateItem() : !$obj->canUpdateItem(); @@ -503,14 +509,19 @@ static function showTagDropdown($params = []) { // call select2 lib for this input echo Html::scriptBlock("$(function() { $('#tag_select_$rand').select2({ - 'formatResult': formatOption, - 'formatSelection': formatOption, - 'formatSearching': '".__("Loading...")."', - 'dropdownCssClass': 'tag_select_results', - 'tags': ".json_encode($select2_tags).", - 'tokenSeparators': [',', ';'], - 'readonly': ".($readOnly ? 'true': 'false').", - 'createSearchChoice': function (term) { + templateResult: formatOption, + templateSelection: formatOption, + formatSearching: '".__("Loading...")."', + dropdownCssClass: 'tag_select_results', + data: ".json_encode($select2_tags).", + tags: true, + tokenSeparators: [',', ';'], + readonly: ".($readOnly ? 'true': 'false').", + createTag: function (params) { + var term = $.trim(params.term); + if (term === '') { + return null; + } $token_creation } }); diff --git a/inc/tagitem.class.php b/inc/tagitem.class.php index 339c49f..b9c1100 100644 --- a/inc/tagitem.class.php +++ b/inc/tagitem.class.php @@ -327,6 +327,7 @@ static function showForTag(PluginTagTag $tag) { * @return boolean */ static function updateItem(CommonDBTM $item, $options = array()) { + if ($item->getID() && !isset($item->input["_plugin_tag_tag_values"])) { return true; @@ -342,11 +343,10 @@ static function updateItem(CommonDBTM $item, $options = array()) { $tag = new PluginTagTag(); $tag_item = new self(); - // untokenize values and create new ones - $tag_values = []; - if (!empty($item->input["_plugin_tag_tag_values"])) { - $tag_values = explode(',', $item->input["_plugin_tag_tag_values"]); - } + // create new values + $tag_values = !empty($item->input["_plugin_tag_tag_values"]) + ? $item->input["_plugin_tag_tag_values"] + : []; foreach ($tag_values as &$tag_value) { if (strpos($tag_value, "newtag_") !== false) { $tag_value = str_replace("newtag_", "", $tag_value); @@ -437,7 +437,7 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, if ($tagitem->deleteByCriteria([ 'items_id' => $items_id, 'itemtype' => $itemtype, - 'plugin_tag_tags_id' => explode(',', $input['_plugin_tag_tag_values']), + 'plugin_tag_tags_id' => $input['_plugin_tag_tag_values'], ])) { $ma->itemDone($item->getType(), $items_id, MassiveAction::ACTION_OK); } else { diff --git a/js/common.js b/js/common.js index 0c292c8..29559e4 100644 --- a/js/common.js +++ b/js/common.js @@ -33,5 +33,5 @@ function formatOption(option) { } template+= "'>" + option.text + ""; - return template; + return $(template); } From 5d78a694f971a0a31a14d353f7e83246425ca189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 25 Jun 2018 16:13:10 +0200 Subject: [PATCH 3/7] Fix undefined type_menu on install; fixes #52 --- inc/tag.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/tag.class.php b/inc/tag.class.php index 1073739..9378f23 100644 --- a/inc/tag.class.php +++ b/inc/tag.class.php @@ -129,7 +129,8 @@ public static function install(Migration $migration) { } // Version 0.90-1.1 - $fields = $DB->list_fields($table); + // Disable cache on field list as cache wes not pruned after adding field + $fields = $DB->list_fields($table, false); if (stristr($fields['type_menu']["Type"], 'varchar') !== false) { $migration->changeField($table, 'type_menu', 'type_menu', 'text'); $migration->dropKey($table, 'type_menu'); From 0cccc3c34997646f4911421cbfa92ab4cafafb4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 26 Jun 2018 11:13:47 +0200 Subject: [PATCH 4/7] Use stable dependencies and force compatibility with PHP 5.6 --- .travis.yml | 2 +- composer.json | 9 +- composer.lock | 834 ++++++++++++++++++++++++++++++-------------------- 3 files changed, 512 insertions(+), 333 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2963c9..972e75d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: php php: - - 5.5 - 5.6 - 7.0 - 7.1 + - 7.2 - nightly #env: diff --git a/composer.json b/composer.json index 487dc91..e21ea28 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,10 @@ { - "minimum-stability": "dev", - "prefer-stable": true, "require-dev": { - "glpi-project/tools": "^0.1.1" + "glpi-project/tools": "^0.1" + }, + "config": { + "platform": { + "php": "5.6" + } } } diff --git a/composer.lock b/composer.lock index b357f52..148885b 100644 --- a/composer.lock +++ b/composer.lock @@ -1,38 +1,38 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d80a87e6638356e6726b4dbdb32f1f60", + "content-hash": "1780e587040d1a21844800dc378c2f2e", "packages": [], "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.4.0", + "version": "2.8.4", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "80afffd362bd1cf83bef60db690a8c50d8390803" + "reference": "651541a0b68318a2a202bda558a676e5ad92223c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/80afffd362bd1cf83bef60db690a8c50d8390803", - "reference": "80afffd362bd1cf83bef60db690a8c50d8390803", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/651541a0b68318a2a202bda558a676e5ad92223c", + "reference": "651541a0b68318a2a202bda558a676e5ad92223c", "shasum": "" }, "require": { - "consolidation/output-formatters": "^3.1.5", + "consolidation/output-formatters": "^3.1.12", "php": ">=5.4.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "psr/log": "~1", - "symfony/console": "^2.8|~3", - "symfony/event-dispatcher": "^2.5|~3", - "symfony/finder": "^2.5|~3" + "psr/log": "^1", + "symfony/console": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.5|^3|^4", + "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "4.*", - "satooshi/php-coveralls": "^1.0", + "g1a/composer-test-scenarios": "^2", + "phpunit/phpunit": "^6", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", @@ -57,29 +57,85 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2017-02-04T06:13:54+00:00" + "time": "2018-05-25T18:04:25+00:00" + }, + { + "name": "consolidation/config", + "version": "1.0.11", + "source": { + "type": "git", + "url": "https://github.com/consolidation/config.git", + "reference": "ede41d946078e97e7a9513aadc3352f1c26817af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/consolidation/config/zipball/ede41d946078e97e7a9513aadc3352f1c26817af", + "reference": "ede41d946078e97e7a9513aadc3352f1c26817af", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "grasmash/expander": "^1", + "php": ">=5.4.0" + }, + "require-dev": { + "g1a/composer-test-scenarios": "^1", + "phpunit/phpunit": "^4", + "satooshi/php-coveralls": "^1.0", + "squizlabs/php_codesniffer": "2.*", + "symfony/console": "^2.5|^3|^4", + "symfony/yaml": "^2.8.11|^3|^4" + }, + "suggest": { + "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Consolidation\\Config\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" + } + ], + "description": "Provide configuration services for a commandline tool.", + "time": "2018-05-27T01:17:02+00:00" }, { "name": "consolidation/log", - "version": "1.0.3", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "74ba81b4edc585616747cc5c5309ce56fec41254" + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/74ba81b4edc585616747cc5c5309ce56fec41254", - "reference": "74ba81b4edc585616747cc5c5309ce56fec41254", + "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395", + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395", "shasum": "" }, "require": { "php": ">=5.5.0", "psr/log": "~1.0", - "symfony/console": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4" }, "require-dev": { + "g1a/composer-test-scenarios": "^1", "phpunit/phpunit": "4.*", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "2.*" }, "type": "library", @@ -104,37 +160,43 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2016-03-23T23:46:42+00:00" + "time": "2018-05-25T18:14:39+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.1.7", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "da39a0f14d5aaaee06732bb7cef2aea1de056b40" + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/da39a0f14d5aaaee06732bb7cef2aea1de056b40", - "reference": "da39a0f14d5aaaee06732bb7cef2aea1de056b40", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", "shasum": "" }, "require": { "php": ">=5.4.0", - "symfony/console": "~2.5|~3.0", - "symfony/finder": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4", + "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "4.*", - "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "2.*", + "g1a/composer-test-scenarios": "^2", + "phpunit/phpunit": "^5.7.27", + "satooshi/php-coveralls": "^2", + "squizlabs/php_codesniffer": "^2.7", + "symfony/console": "3.2.3", + "symfony/var-dumper": "^2.8|^3|^4", "victorjonsson/markdowndocs": "^1.3" }, + "suggest": { + "symfony/var-dumper": "For using the var_dump formatter" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { @@ -153,52 +215,57 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2017-01-21T06:26:40+00:00" + "time": "2018-05-25T18:02:34+00:00" }, { "name": "consolidation/robo", - "version": "dev-master", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "cdc15c0059a1b2d5287910df678e8a73cbaa8ed6" + "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/cdc15c0059a1b2d5287910df678e8a73cbaa8ed6", - "reference": "cdc15c0059a1b2d5287910df678e8a73cbaa8ed6", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/ac563abfadf7cb7314b4e152f2b5033a6c255f6f", + "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.2", + "consolidation/annotated-command": "^2.8.2", + "consolidation/config": "^1.0.10", "consolidation/log": "~1", - "consolidation/output-formatters": "^3.1.5", + "consolidation/output-formatters": "^3.1.13", + "grasmash/yaml-expander": "^1.3", "league/container": "^2.2", "php": ">=5.5.0", - "symfony/console": "~2.8|~3.0", - "symfony/event-dispatcher": "~2.5|~3.0", - "symfony/filesystem": "~2.5|~3.0", - "symfony/finder": "~2.5|~3.0", - "symfony/process": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.5|^3|^4", + "symfony/filesystem": "^2.5|^3|^4", + "symfony/finder": "^2.5|^3|^4", + "symfony/process": "^2.5|^3|^4" }, "replace": { "codegyre/robo": "< 1.0" }, "require-dev": { - "codeception/aspect-mock": "~1", - "codeception/base": "^2.2.6", + "codeception/aspect-mock": "^1|^2.1.1", + "codeception/base": "^2.3.7", "codeception/verify": "^0.3.2", - "henrikbjorn/lurker": "~1", - "natxet/cssmin": "~3", + "g1a/composer-test-scenarios": "^2", + "goaop/framework": "~2.1.2", + "goaop/parser-reflection": "^1.1.0", + "natxet/cssmin": "3.0.4", + "nikic/php-parser": "^3.1.5", "patchwork/jsqueeze": "~2", "pear/archive_tar": "^1.4.2", "phpunit/php-code-coverage": "~2|~4", - "satooshi/php-coveralls": "~1", - "squizlabs/php_codesniffer": "~2" + "satooshi/php-coveralls": "^2", + "squizlabs/php_codesniffer": "^2.8" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", - "natxet/CssMin": "For minifying JS files in taskMinify", + "natxet/CssMin": "For minifying CSS files in taskMinify", "patchwork/jsqueeze": "For minifying JS files in taskMinify", "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively." }, @@ -208,13 +275,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "1.x-dev", + "dev-state": "1.x-dev" } }, "autoload": { - "classmap": [ - "scripts/composer/ScriptHandler.php" - ], "psr-4": { "Robo\\": "src" } @@ -230,22 +295,25 @@ } ], "description": "Modern task runner", - "time": "2017-02-08T01:45:50+00:00" + "time": "2018-05-27T01:42:53+00:00" }, { "name": "container-interop/container-interop", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/container-interop/container-interop.git", - "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e" + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e", - "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e", + "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", "shasum": "" }, + "require": { + "psr/container": "^1.0" + }, "type": "library", "autoload": { "psr-4": { @@ -257,34 +325,94 @@ "MIT" ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "time": "2014-12-30T15:22:37+00:00" + "homepage": "https://github.com/container-interop/container-interop", + "time": "2017-02-14T19:40:03+00:00" + }, + { + "name": "dflydev/dot-access-data", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/dflydev/dflydev-dot-access-data.git", + "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a", + "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Dflydev\\DotAccessData": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dragonfly Development Inc.", + "email": "info@dflydev.com", + "homepage": "http://dflydev.com" + }, + { + "name": "Beau Simensen", + "email": "beau@dflydev.com", + "homepage": "http://beausimensen.com" + }, + { + "name": "Carlos Frutos", + "email": "carlos@kiwing.it", + "homepage": "https://github.com/cfrutos" + } + ], + "description": "Given a deep data structure, access data by dot notation.", + "homepage": "https://github.com/dflydev/dflydev-dot-access-data", + "keywords": [ + "access", + "data", + "dot", + "notation" + ], + "time": "2017-01-20T21:14:22+00:00" }, { "name": "glpi-project/coding-standard", - "version": "0.5", + "version": "0.7.1", "source": { "type": "git", "url": "https://github.com/glpi-project/coding-standard.git", - "reference": "e19495c896a01199a2fec2e65b7613310598cf96" + "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/e19495c896a01199a2fec2e65b7613310598cf96", - "reference": "e19495c896a01199a2fec2e65b7613310598cf96", + "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/1cef37d764aecf8fd7d5d167db25da97e289cb03", + "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "~2.0" + "squizlabs/php_codesniffer": "^3.3" }, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ - "GPLv3" + "GPL-2.0-or-later" ], "authors": [ { "name": "Teclib'", - "email": "contact@teclib.com", + "email": "glpi@teclib.com", "homepage": "https://teclib.com" } ], @@ -294,27 +422,27 @@ "glpi", "phpcs" ], - "time": "2017-01-06T11:10:46+00:00" + "time": "2018-06-07T08:45:05+00:00" }, { "name": "glpi-project/tools", - "version": "0.1.1", + "version": "0.1.5", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "89083f6e71fac05190c7cc76a9c5afd8b1f421ef" + "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/89083f6e71fac05190c7cc76a9c5afd8b1f421ef", - "reference": "89083f6e71fac05190c7cc76a9c5afd8b1f421ef", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/5ff99fa5967b468af3d3ba2d7a69ede1214273ea", + "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea", "shasum": "" }, "require": { - "consolidation/robo": "dev-master@dev", - "glpi-project/coding-standard": "0.5", - "natxet/cssmin": "~3.0", - "patchwork/jsqueeze": "~1.0" + "consolidation/robo": "^1.3", + "glpi-project/coding-standard": "^0.7", + "natxet/cssmin": "^3.0", + "patchwork/jsqueeze": "^1.0" }, "bin": [ "tools/plugin-release", @@ -329,13 +457,13 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPLv3" + "GPL-3.0-or-later" ], "authors": [ { "name": "Teclib'", "email": "glpi@teclib.com", - "homepage": "https://teclib.com" + "homepage": "http://teclib-group.com" } ], "description": "Various tools for GLPI and its plugins", @@ -344,28 +472,124 @@ "plugins", "tools" ], - "time": "2017-02-08T08:20:09+00:00" + "time": "2018-06-21T11:59:33+00:00" + }, + { + "name": "grasmash/expander", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/grasmash/expander.git", + "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f", + "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "php": ">=5.4" + }, + "require-dev": { + "greg-1-anderson/composer-test-scenarios": "^1", + "phpunit/phpunit": "^4|^5.5.4", + "satooshi/php-coveralls": "^1.0.2|dev-master", + "squizlabs/php_codesniffer": "^2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Grasmash\\Expander\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Grasmick" + } + ], + "description": "Expands internal property references in PHP arrays file.", + "time": "2017-12-21T22:14:55+00:00" + }, + { + "name": "grasmash/yaml-expander", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/grasmash/yaml-expander.git", + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1", + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "php": ">=5.4", + "symfony/yaml": "^2.8.11|^3|^4" + }, + "require-dev": { + "greg-1-anderson/composer-test-scenarios": "^1", + "phpunit/phpunit": "^4.8|^5.5.4", + "satooshi/php-coveralls": "^1.0.2|dev-master", + "squizlabs/php_codesniffer": "^2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Grasmash\\YamlExpander\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Grasmick" + } + ], + "description": "Expands internal property references in a yaml file.", + "time": "2017-12-16T16:06:03+00:00" }, { "name": "league/container", - "version": "2.2.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "c0e7d947b690891f700dc4967ead7bdb3d6708c1" + "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/c0e7d947b690891f700dc4967ead7bdb3d6708c1", - "reference": "c0e7d947b690891f700dc4967ead7bdb3d6708c1", + "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0", + "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.1", - "php": ">=5.4.0" + "container-interop/container-interop": "^1.2", + "php": "^5.4.0 || ^7.0" }, "provide": { - "container-interop/container-interop-implementation": "^1.1" + "container-interop/container-interop-implementation": "^1.2", + "psr/container-implementation": "^1.0" }, "replace": { "orno/di": "~2.0" @@ -376,7 +600,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev", + "dev-2.x": "2.x-dev", "dev-1.x": "1.x-dev" } }, @@ -408,20 +632,20 @@ "provider", "service" ], - "time": "2016-03-17T11:07:59+00:00" + "time": "2017-05-10T09:20:27+00:00" }, { "name": "natxet/CssMin", - "version": "v3.0.4", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/natxet/CssMin.git", - "reference": "92de3fe3ccb4f8298d31952490ef7d5395855c39" + "reference": "d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/natxet/CssMin/zipball/92de3fe3ccb4f8298d31952490ef7d5395855c39", - "reference": "92de3fe3ccb4f8298d31952490ef7d5395855c39", + "url": "https://api.github.com/repos/natxet/CssMin/zipball/d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd", + "reference": "d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd", "shasum": "" }, "require": { @@ -455,7 +679,7 @@ "css", "minify" ], - "time": "2015-09-25T11:13:11+00:00" + "time": "2018-01-09T11:15:01+00:00" }, { "name": "patchwork/jsqueeze", @@ -500,24 +724,21 @@ "time": "2015-03-25T10:11:08+00:00" }, { - "name": "phpdocumentor/reflection-common", - "version": "1.0", + "name": "psr/container", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", "shasum": "" }, "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" + "php": ">=5.3.0" }, "type": "library", "extra": { @@ -527,9 +748,7 @@ }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] + "Psr\\Container\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -538,112 +757,20 @@ ], "authors": [ { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2015-12-27T11:43:31+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30T07:12:33+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.2.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" ], - "time": "2016-11-25T06:54:22+00:00" + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/log", @@ -694,64 +821,37 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.8.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "86dd55a522238211f9f3631e3361703578941d9a" + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/86dd55a522238211f9f3631e3361703578941d9a", - "reference": "86dd55a522238211f9f3631e3361703578941d9a", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266", + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.1.2" + "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "bin": [ - "scripts/phpcs", - "scripts/phpcbf" + "bin/phpcs", + "bin/phpcbf" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Fixer.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -768,43 +868,49 @@ "phpcs", "standards" ], - "time": "2017-02-02T03:30:00+00:00" + "time": "2018-06-06T23:58:19+00:00" }, { "name": "symfony/console", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936" + "reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7a8405a9fc175f87fed8a3c40856b0d866d61936", - "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936", + "url": "https://api.github.com/repos/symfony/console/zipball/1b97071a26d028c9bd4588264e101e14f6e7cd00", + "reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/debug": "~2.8|~3.0", + "php": "^5.5.9|>=7.0.8", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -831,37 +937,36 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-02-06T12:04:21+00:00" + "time": "2018-05-23T05:02:55+00:00" }, { "name": "symfony/debug", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477" + "reference": "47e6788c5b151cf0cfdf3329116bf33800632d75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/b4d9818f127c60ce21ed62c395da7df868dc8477", - "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477", + "url": "https://api.github.com/repos/symfony/debug/zipball/47e6788c5b151cf0cfdf3329116bf33800632d75", + "reference": "47e6788c5b151cf0cfdf3329116bf33800632d75", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "psr/log": "~1.0" }, "conflict": { "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -888,31 +993,34 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-28T02:37:08+00:00" + "time": "2018-06-25T11:10:40+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6" + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6", - "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8", + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" + }, + "conflict": { + "symfony/dependency-injection": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -921,7 +1029,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -948,29 +1056,30 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2018-04-06T07:35:25+00:00" }, { "name": "symfony/filesystem", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "a0c6ef2dc78d33b58d91d3a49f49797a184d06f4" + "reference": "8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/a0c6ef2dc78d33b58d91d3a49f49797a184d06f4", - "reference": "a0c6ef2dc78d33b58d91d3a49f49797a184d06f4", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed", + "reference": "8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -997,29 +1106,29 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:47:33+00:00" + "time": "2018-06-21T11:10:19+00:00" }, { "name": "symfony/finder", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6" + "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6", + "url": "https://api.github.com/repos/symfony/finder/zipball/3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394", + "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1046,20 +1155,75 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2018-06-19T20:52:10+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-04-30T19:57:29+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.3.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -1071,7 +1235,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -1105,29 +1269,29 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/process", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "32646a7cf53f3956c76dcb5c82555224ae321858" + "reference": "acc5a37c706ace827962851b69705b24e71ca17c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/32646a7cf53f3956c76dcb5c82555224ae321858", - "reference": "32646a7cf53f3956c76dcb5c82555224ae321858", + "url": "https://api.github.com/repos/symfony/process/zipball/acc5a37c706ace827962851b69705b24e71ca17c", + "reference": "acc5a37c706ace827962851b69705b24e71ca17c", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1154,39 +1318,48 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-02-03T12:11:38+00:00" + "time": "2018-05-30T04:24:30+00:00" }, { - "name": "webmozart/assert", - "version": "1.2.0", + "name": "symfony/yaml", + "version": "v3.4.12", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + "url": "https://github.com/symfony/yaml.git", + "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", + "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<3.4" }, "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" + "symfony/console": "~3.4|~4.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { "psr-4": { - "Webmozart\\Assert\\": "src/" - } + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1194,24 +1367,27 @@ ], "authors": [ { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2016-11-23T20:04:58+00:00" + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2018-05-03T23:18:14+00:00" } ], "aliases": [], - "minimum-stability": "dev", + "minimum-stability": "stable", "stability-flags": [], - "prefer-stable": true, + "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "5.6" + } } From 35f10258705d2372c661959ceafe45fe3888ce35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 26 Jun 2018 11:14:45 +0200 Subject: [PATCH 5/7] Fix conding standards violations --- inc/tag.class.php | 16 ++++++++-------- inc/taginjection.class.php | 6 +++--- inc/tagitem.class.php | 2 +- setup.php | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/inc/tag.class.php b/inc/tag.class.php index 9378f23..0ff955f 100644 --- a/inc/tag.class.php +++ b/inc/tag.class.php @@ -6,7 +6,7 @@ class PluginTagTag extends CommonDropdown { const S_OPTION = 10500; - public static function getTypeName($nb=1) { + public static function getTypeName($nb = 1) { return _n('Tag', 'Tags', $nb, 'tag'); } @@ -39,7 +39,7 @@ public static function canItemtype($itemtype = '') { || !in_array($itemtype, self::getBlacklistItemtype())); } - public function showForm($ID, $options = array()) { + public function showForm($ID, $options = []) { global $CFG_GLPI; $this->initForm($ID, $options); @@ -177,13 +177,13 @@ public static function uninstall() { return true; } - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { $tab = []; $tab[2] = _n('Associated item', 'Associated items', 2); //Note : can add nb_element here return $tab; } - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { switch ($item->getType()) { case __CLASS__ : switch ($tabnum) { @@ -197,7 +197,7 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtempl return true; } - function defineTabs($options=array()) { + function defineTabs($options = []) { $ong = []; $this->addDefaultFormTab($ong); $this->addStandardTab(__CLASS__, $ong, $options); @@ -310,7 +310,7 @@ function rawSearchOptions() { return $tab; } - static function getSpecificValueToSelect($field, $name='', $values='', array $options=array()) { + static function getSpecificValueToSelect($field, $name = '', $values = '', array $options = []) { if (!is_array($values)) { $values = [$field => $values]; } @@ -331,7 +331,7 @@ static function getSpecificValueToSelect($field, $name='', $values='', array $op return parent::getSpecificValueToSelect($field, $name, $values, $options); } - static function getSpecificValueToDisplay($field, $values, array $options = array()) { + static function getSpecificValueToDisplay($field, $values, array $options = []) { switch ($field) { case 'type_menu': $itemtypes = json_decode($values[$field]); @@ -371,7 +371,7 @@ static function parseItemtype($itemtype, $id = 0) { * - item the CommonDBTM object * @return nothing */ - static function preItemForm($params = array()) { + static function preItemForm($params = []) { if (isset($params['item']) && $params['item'] instanceof CommonDBTM) { $item = $params['item']; diff --git a/inc/taginjection.class.php b/inc/taginjection.class.php index 7bd98bc..2dbc009 100644 --- a/inc/taginjection.class.php +++ b/inc/taginjection.class.php @@ -8,7 +8,7 @@ static function getTable($classname = null) { return $parenttype::getTable(); } - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { return parent::getTypeName(1); } @@ -24,7 +24,7 @@ function connectedTo() { /** * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::getOptions() **/ - function getOptions($primary_type='') { + function getOptions($primary_type = '') { $tab = Search::getOptions(get_parent_class($this)); @@ -38,7 +38,7 @@ function getOptions($primary_type='') { /** * @see plugins/datainjection/inc/PluginDatainjectionInjectionInterface::addOrUpdateObject() **/ - function addOrUpdateObject($values=array(), $options=array()) { + function addOrUpdateObject($values = [], $options = []) { $lib = new PluginDatainjectionCommonInjectionLib($this, $values, $options); $lib->processAddOrUpdate(); diff --git a/inc/tagitem.class.php b/inc/tagitem.class.php index b9c1100..1cf1e70 100644 --- a/inc/tagitem.class.php +++ b/inc/tagitem.class.php @@ -326,7 +326,7 @@ static function showForTag(PluginTagTag $tag) { * * @return boolean */ - static function updateItem(CommonDBTM $item, $options = array()) { + static function updateItem(CommonDBTM $item, $options = []) { if ($item->getID() && !isset($item->input["_plugin_tag_tag_values"])) { diff --git a/setup.php b/setup.php index 53f0d93..63a16f4 100644 --- a/setup.php +++ b/setup.php @@ -40,7 +40,7 @@ * * @return boolean */ -function plugin_tag_check_config($verbose=false) { +function plugin_tag_check_config($verbose = false) { return true; } From 7475ae9d0eb0774c7e23b0cf11236dd7a5d6b598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 26 Jun 2018 11:23:13 +0200 Subject: [PATCH 6/7] Update locales --- .tx/config | 4 ++-- locales/cs_CZ.mo | Bin 925 -> 925 bytes locales/cs_CZ.po | 10 +++++----- locales/en_GB.mo | Bin 790 -> 790 bytes locales/en_GB.po | 10 +++++----- locales/en_US.mo | Bin 789 -> 789 bytes locales/en_US.po | 10 +++++----- locales/es.mo | Bin 820 -> 0 bytes locales/es.po | 45 --------------------------------------------- locales/es_419.mo | Bin 844 -> 844 bytes locales/es_419.po | 10 +++++----- locales/es_ES.mo | Bin 834 -> 834 bytes locales/es_ES.po | 10 +++++----- locales/es_MX.mo | Bin 835 -> 835 bytes locales/es_MX.po | 10 +++++----- locales/fi_FI.mo | Bin 795 -> 795 bytes locales/fi_FI.po | 10 +++++----- locales/fr_FR.mo | Bin 839 -> 839 bytes locales/fr_FR.po | 10 +++++----- locales/hu_HU.mo | Bin 829 -> 829 bytes locales/hu_HU.po | 10 +++++----- locales/it_IT.mo | Bin 604 -> 604 bytes locales/it_IT.po | 10 +++++----- locales/pl_PL.mo | Bin 910 -> 910 bytes locales/pl_PL.po | 10 +++++----- locales/pt_BR.mo | Bin 832 -> 832 bytes locales/pt_BR.po | 10 +++++----- locales/ro_RO.mo | Bin 649 -> 649 bytes locales/ro_RO.po | 10 +++++----- locales/ru_RU.mo | Bin 766 -> 766 bytes locales/ru_RU.po | 10 +++++----- locales/sk_SK.mo | Bin 889 -> 889 bytes locales/sk_SK.po | 10 +++++----- locales/tag.pot | 10 +++++----- locales/tr_TR.mo | Bin 788 -> 788 bytes locales/tr_TR.po | 10 +++++----- 36 files changed, 87 insertions(+), 132 deletions(-) delete mode 100644 locales/es.mo delete mode 100644 locales/es.po diff --git a/.tx/config b/.tx/config index a0a1536..e12ebb5 100644 --- a/.tx/config +++ b/.tx/config @@ -1,8 +1,8 @@ [main] host = https://www.transifex.com -[glpi-plugin-tag.glpipot-7] +[glpi-plugin-tag.tag-pot] file_filter = locales/.po source_file = locales/tag.pot source_lang = en - +type = PO diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index eb2ca5c69965865d90c442e4a2e32f5b5b11ac97..367e274618e8360a6475a0610792718880639de1 100644 GIT binary patch delta 29 kcmbQsK9_w%5Tk&Fu7R1Zk(q*lrInF^wt>OsBt~l{0BubMzW@LL delta 29 kcmbQsK9_w%5Tk&(u7Rblk&%L-ft7)Ywt>;+Bt~l{0Br9Dxc~qF diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index b4b4c97..854541a 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2018-06-07 13:06+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-tag/language/cs_CZ/)\n" @@ -27,7 +27,7 @@ msgstr "Přidat štítky" msgid "Remove tags" msgstr "Odebrat štítky" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Štítek" @@ -35,14 +35,14 @@ msgstr[1] "Štítky" msgstr[2] "Štítků" msgstr[3] "Štítky" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "Barva v HTML zápisu" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Zobrazit všechny štítky" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Správa štítků" diff --git a/locales/en_GB.mo b/locales/en_GB.mo index 881a39e9ffce169f4be5f3e5dcff6ae282d4453c..84425cd9df111c52a63b4a6f09537020dc97bd88 100644 GIT binary patch delta 29 kcmbQnHjQmV5Tk&Fu7R1Zk(q*lrInF^wt>OsB*ra_0BnE;+B*ra_0Bj-$ApigX diff --git a/locales/en_GB.po b/locales/en_GB.po index 0dc52c9..69c989e 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-22 15:17+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/teclib/glpi-plugin-tag/language/en_GB/)\n" @@ -28,20 +28,20 @@ msgstr "Add tags" msgid "Remove tags" msgstr "Remove tags" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Tag" msgstr[1] "Tags" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "HTML color" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "View all tags" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Tag Management" diff --git a/locales/en_US.mo b/locales/en_US.mo index 102712eed09edc438605925d061e927b58041c43..2605cb82110e945067113b751229c5be459c0719 100644 GIT binary patch delta 29 kcmbQrHkEBd5Tk&Fu7R1Zk(q*lrInF^wt>OsB*x8*0BlAFBme*a delta 29 kcmbQrHkEBd5Tk&(u7Rblk&%L-ft7)Ywt>;+B*x8*0Bh(69smFU diff --git a/locales/en_US.po b/locales/en_US.po index d0e323d..b656b29 100644 --- a/locales/en_US.po +++ b/locales/en_US.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-22 15:17+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-plugin-tag/language/en_US/)\n" @@ -27,20 +27,20 @@ msgstr "Add tags" msgid "Remove tags" msgstr "Remove tags" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Tag" msgstr[1] "Tags" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "HTML color" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "View all tags" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Tag Management" diff --git a/locales/es.mo b/locales/es.mo deleted file mode 100644 index dcbdb962d54e1d0e6bd0c1f746858fa16d8ac6f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 820 zcmZ9Ky>1jS5XTLK4=nYy$y$ce_hC^J!1tR6dDOu7xyA#LAYcIAhcf12F zPeKC{71YqDp`fPW3BovcNdQYf&)EKt#~#g(`MLLu#!X^@D2Us{J0gyc#4X|zkq}>q zc>axu`zOR*;wN#3_)UDi!q_R2@I`BYd1-AdHY$qX}$Z;TVM0Q`OMf z*H{L=UGaT%URjgF^PS-~4E0DV0~{zk*~P}Xzz1Hcif@dh=Y`E78NMv|rb7`Zj6V|r zbLeF4M?72Ooes3KJbSpDb+U|vd>4;Zy#9aPO4O~aEoU^69pM8noG@OCU|kM9jT2!i zbg(D1@UTGwRgv>poS(FOJb5Z>p>(UX^%J_q$Ps;)7bxl+_8MW7KZ3=h5Slzq$K!D; z#2o4nCov)oSZZ~UO5G^loc)^zAyYlOCq, 2017 -msgid "" -msgstr "" -"Project-Id-Version: GLPI Plugin - Tag\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" -"PO-Revision-Date: 2017-09-23 10:39+0000\n" -"Last-Translator: Alexander Salas Bastidas \n" -"Language-Team: Spanish (http://www.transifex.com/teclib/glpi-plugin-tag/language/es/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: hook.php:174 -msgid "Add tags" -msgstr "Agregar etiquetas" - -#: hook.php:176 -msgid "Remove tags" -msgstr "Eliminar etiquetas" - -#: inc/tag.class.php:10 inc/tag.class.php:384 -msgid "Tag" -msgid_plural "Tags" -msgstr[0] "Etiqueta" -msgstr[1] "Etiquetas" - -#: inc/tag.class.php:65 inc/tag.class.php:279 -msgid "HTML color" -msgstr "Color HTML" - -#: inc/tag.class.php:495 -msgid "View all tags" -msgstr "Ver todas las etiquetas" - -#: setup.php:113 -msgid "Tag Management" -msgstr "Administración de etiquetas" diff --git a/locales/es_419.mo b/locales/es_419.mo index b8f30fbeca43bcf469a0e94577a2fbe1573d13f9..ad3a39d8286e308bc6e280702c1feb4a79f88617 100644 GIT binary patch delta 29 kcmX@Zc7|<35Tk&Fu7R1Zk(q*lrInF^wt>OsB*s^a0C>Cy$p8QV delta 29 kcmX@Zc7|<35Tk&(u7Rblk&%L-ft7)Ywt>;+B*s^a0C-*p!vFvP diff --git a/locales/es_419.po b/locales/es_419.po index 44f0544..fae3464 100644 --- a/locales/es_419.po +++ b/locales/es_419.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-23 10:39+0000\n" "Last-Translator: Alexander Salas Bastidas \n" "Language-Team: Spanish (Latin America) (http://www.transifex.com/teclib/glpi-plugin-tag/language/es_419/)\n" @@ -26,20 +26,20 @@ msgstr "Agregar etiquetas" msgid "Remove tags" msgstr "Eliminar etiquetas" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Etiqueta" msgstr[1] "Etiquetas" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "Color HTML" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Ver todas las etiquetas" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Administración de etiquetas" diff --git a/locales/es_ES.mo b/locales/es_ES.mo index f8bf44617686edd89aa2de53eedb7fcdb8004b8a..a6b4ad3527ae1b9b9b867dcdac804f14e93929fe 100644 GIT binary patch delta 29 kcmX@ac8G055Tk&Fu7R1Zk(q*lrInF^wt>OsB*q7f0Cso>s{jB1 delta 29 kcmX@ac8G055Tk&(u7Rblk&%L-ft7)Ywt>;+B*q7f0CpM&r2qf` diff --git a/locales/es_ES.po b/locales/es_ES.po index 75a26d8..606e116 100644 --- a/locales/es_ES.po +++ b/locales/es_ES.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-22 15:17+0000\n" "Last-Translator: Alexander Salas Bastidas \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-plugin-tag/language/es_ES/)\n" @@ -27,20 +27,20 @@ msgstr "Agregar etiquetas" msgid "Remove tags" msgstr "Eliminar etiquetas" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Etiqueta" msgstr[1] "Etiquetas" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "Color HTML" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Ver todas las etiquetas" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Administración de etiquetas" diff --git a/locales/es_MX.mo b/locales/es_MX.mo index fbd3cf40e77d5143cce93e97673a761be38713ec..b685d5660ca4156347a7321740c99f325b27cc44 100644 GIT binary patch delta 29 kcmX@ic9?BL5Tk&Fu7R1Zk(q*lrInF^wt>OsB*uq~0Cutmt^fc4 delta 29 kcmX@ic9?BL5Tk&(u7Rblk&%L-ft7)Ywt>;+B*uq~0CrRdr~m)} diff --git a/locales/es_MX.po b/locales/es_MX.po index 4882676..967b99d 100644 --- a/locales/es_MX.po +++ b/locales/es_MX.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-22 15:17+0000\n" "Last-Translator: Alexander Salas Bastidas \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/teclib/glpi-plugin-tag/language/es_MX/)\n" @@ -26,20 +26,20 @@ msgstr "Agregar etiquetas" msgid "Remove tags" msgstr "Eliminar etiquetas" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Etiqueta" msgstr[1] "Etiquetas" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "Color HTML" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Ver todas las etiquetas" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Administración de etiquetas" diff --git a/locales/fi_FI.mo b/locales/fi_FI.mo index a97b419198d7ffbc3b4cc35374b7a77d75815300..ad15ff7a6e7c29f686d85330913d504456b15310 100644 GIT binary patch delta 29 kcmbQuHk)lj5Tk&Fu7R1Zk(q*lrInF^wt>OsB*vYL0BxcNHUIzs delta 29 kcmbQuHk)lj5Tk&(u7Rblk&%L-ft7)Ywt>;+B*vYL0BuAEFaQ7m diff --git a/locales/fi_FI.po b/locales/fi_FI.po index d6274ea..3cb8507 100644 --- a/locales/fi_FI.po +++ b/locales/fi_FI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2018-05-29 17:42+0000\n" "Last-Translator: Markku Vepsä\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/teclib/glpi-plugin-tag/language/fi_FI/)\n" @@ -26,20 +26,20 @@ msgstr "Lisää tunnisteita" msgid "Remove tags" msgstr "Poista tunnisteita" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Tunniste" msgstr[1] "Tunnisteet" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "HTML-väri" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Näytä kaikki tunnisteet" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Tunnisteiden hallinta" diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index cab4408c0ac7206e10e12033cd397a36aaf585c9..a5858727bbcf0921b2d04031395ca9ba8ad32041 100644 GIT binary patch delta 29 kcmX@kcARZP5Tk&Fu7R1Zk(q*lrInF^wt>OsB*v$V0C$=Px&QzG delta 29 kcmX@kcARZP5Tk&(u7Rblk&%L-ft7)Ywt>;+B*v$V0CzkGv;Y7A diff --git a/locales/fr_FR.po b/locales/fr_FR.po index ea6d874..90ae281 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-23 21:40+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: French (France) (http://www.transifex.com/teclib/glpi-plugin-tag/language/fr_FR/)\n" @@ -29,20 +29,20 @@ msgstr "Ajouter des étiquettes" msgid "Remove tags" msgstr "Supprimer des étiquettes" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Etiquette" msgstr[1] "Etiquettes" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "Couleur HTML" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Voir toutes les étiquettes" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Gestion des tags" diff --git a/locales/hu_HU.mo b/locales/hu_HU.mo index be4ba2afb684b5a0ffc4ef2005d6dcec5407f71d..c4ca9f3de57eaadddb80242c095a8876ced1e395 100644 GIT binary patch delta 29 kcmdnXwwG-~5Tk&Fu7R1Zk(q*lrInF^wt>OsB*xo}0CiReoB#j- delta 29 kcmdnXwwG-~5Tk&(u7Rblk&%L-ft7)Ywt>;+B*xo}0Ce~VmH+?% diff --git a/locales/hu_HU.po b/locales/hu_HU.po index a2824ff..2a6832c 100644 --- a/locales/hu_HU.po +++ b/locales/hu_HU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2018-05-16 11:19+0000\n" "Last-Translator: Laszlo Czirbesz \n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/teclib/glpi-plugin-tag/language/hu_HU/)\n" @@ -26,20 +26,20 @@ msgstr "Címkék hozzáadása" msgid "Remove tags" msgstr "Címkék eltávolítása" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Címke" msgstr[1] "Címkék" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "HTML szín" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Minden címke megtekintése" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Címke Kezelés" diff --git a/locales/it_IT.mo b/locales/it_IT.mo index 14eb07b7fcdf25f5496a37ebba72b4f783d821a3..46db95b404f5b8f7c1c087d3e49d7c1565cf7c43 100644 GIT binary patch delta 27 icmcb^a))KYIROh@12bJCGX(=nDKFlfR|ri2 delta 27 icmcb^a))KYIRSHB14~^aBLzbPD+3d41EY=i>KFle{|H9_ diff --git a/locales/it_IT.po b/locales/it_IT.po index 03b55d0..cfd4b3f 100644 --- a/locales/it_IT.po +++ b/locales/it_IT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-22 15:17+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: Italian (Italy) (http://www.transifex.com/teclib/glpi-plugin-tag/language/it_IT/)\n" @@ -26,20 +26,20 @@ msgstr "" msgid "Remove tags" msgstr "" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "" msgstr[1] "" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "Colore HTML" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Gestione Tag" diff --git a/locales/pl_PL.mo b/locales/pl_PL.mo index 28217078cd2d34421760639e8a69dfbbce31b7b2..d1fab2b05a1581d122f9468e7d3b352760e501ee 100644 GIT binary patch delta 29 kcmeBU?_=L!$tYln+a delta 29 kcmeBU?_=L!$tYm1YhbBsWTaqdU}a#UZD6$7lhKt40A~LNa{vGU diff --git a/locales/pl_PL.po b/locales/pl_PL.po index 7f3c03b..fffd3b2 100644 --- a/locales/pl_PL.po +++ b/locales/pl_PL.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-10-29 22:52+0000\n" "Last-Translator: awiamo\n" "Language-Team: Polish (Poland) (http://www.transifex.com/teclib/glpi-plugin-tag/language/pl_PL/)\n" @@ -26,7 +26,7 @@ msgstr "Dodaj słowa kluczowe" msgid "Remove tags" msgstr "Usuń słowa kluczowe" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "" @@ -34,14 +34,14 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "kolor HTML" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Pokaż wszystkie słowa kluczowe" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Zarządzanie słowami kluczowymi" diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo index 6c7aeff6045048f923cc8002f8729998f3e250cd..9fa8019e1a2da540b24b8a91f9ae8c1b7bf34a87 100644 GIT binary patch delta 29 kcmX@Wc7Sa|5Tk&Fu7R1Zk(q*lrInF^wt>OsB*uG;0Cofir2qf` delta 29 kcmX@Wc7Sa|5Tk&(u7Rblk&%L-ft7)Ywt>;+B*uG;0ClDZp8x;= diff --git a/locales/pt_BR.po b/locales/pt_BR.po index 9a893ff..2c4e126 100644 --- a/locales/pt_BR.po +++ b/locales/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-22 15:17+0000\n" "Last-Translator: Arthur Ramos Schaefer \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/teclib/glpi-plugin-tag/language/pt_BR/)\n" @@ -27,20 +27,20 @@ msgstr "Adicionar etiquetas" msgid "Remove tags" msgstr "Remover etiquetas" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Etiqueta" msgstr[1] "Etiquetas" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "Cor HTML" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Exibir todas etiquetas" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Gerenciamento de Etiquetas" diff --git a/locales/ro_RO.mo b/locales/ro_RO.mo index a3e81535f4a82c09494fd47d22355435cdccc899..252ccd2b1796431d54fad08b308f2cda99269277 100644 GIT binary patch delta 27 icmeBV?PQ&BPQXIfz)aW3Ou@j?%E&<5z+mIO)r\n" "Language-Team: Romanian (Romania) (http://www.transifex.com/teclib/glpi-plugin-tag/language/ro_RO/)\n" @@ -26,21 +26,21 @@ msgstr "" msgid "Remove tags" msgstr "" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "HTML color" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Tag Management" diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo index 88c08fea58374a9c55681df594352fa39ca40ef8..bf416e95da18e69ac7feea93c173de0d784fb915 100644 GIT binary patch delta 27 icmeyz`j2(OIROh@12bJCGX(=nDjwg@%= delta 27 icmeyz`j2(OIRSHB14~^aBLzbPD+3d41EY=i6qo>jUI;J% diff --git a/locales/ru_RU.po b/locales/ru_RU.po index 04e5047..f523e00 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-22 15:17+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: Russian (Russia) (http://www.transifex.com/teclib/glpi-plugin-tag/language/ru_RU/)\n" @@ -26,7 +26,7 @@ msgstr "" msgid "Remove tags" msgstr "" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "" @@ -34,14 +34,14 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "Цвет HTML" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Управление тэгами" diff --git a/locales/sk_SK.mo b/locales/sk_SK.mo index 5013ec206eac92e24db7e818ff151acbb8ba7783..47c0be3e0ff8f3b9d891bc7b889a3e542676d7f6 100644 GIT binary patch delta 29 kcmey#_LFTx5Tk&Fu7R1Zk(q*lrInF^wt>OsBt~&20D$iYQ2+n{ delta 29 kcmey#_LFTx5Tk&(u7Rblk&%L-ft7)Ywt>;+Bt~&20DzGPO8@`> diff --git a/locales/sk_SK.po b/locales/sk_SK.po index 24f205e..9e6943c 100644 --- a/locales/sk_SK.po +++ b/locales/sk_SK.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Tag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: 2017-09-22 15:30+0000\n" "Last-Translator: balucha \n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/teclib/glpi-plugin-tag/language/sk_SK/)\n" @@ -26,7 +26,7 @@ msgstr "Pridať značky" msgid "Remove tags" msgstr "Odstrániť značky" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Značka" @@ -34,14 +34,14 @@ msgstr[1] "Značky" msgstr[2] "Značky" msgstr[3] "Značky" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "Farba HTML" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Zobraziť všetky značky" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Správa značiek" diff --git a/locales/tag.pot b/locales/tag.pot index 6fcb4be..ea10047 100644 --- a/locales/tag.pot +++ b/locales/tag.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 10:04+0200\n" +"POT-Creation-Date: 2018-06-26 09:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,20 +26,20 @@ msgstr "" msgid "Remove tags" msgstr "" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "" msgstr[1] "" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "" diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo index 7e54fc99325ff4ed14fbbd801fd57574b0a19114..15c34532525002aa826f81166ad1bedeb11d08e2 100644 GIT binary patch delta 29 kcmbQjHid0N5Tk&Fu7R1Zk(q*lrInF^wt>OsB*smQ0Bj5gApigX delta 29 kcmbQjHid0N5Tk&(u7Rblk&%L-ft7)Ywt>;+B*smQ0Bf!X8vp\n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/teclib/glpi-plugin-tag/language/tr_TR/)\n" @@ -26,20 +26,20 @@ msgstr "Etiket ekle" msgid "Remove tags" msgstr "Etiket sil" -#: inc/tag.class.php:10 inc/tag.class.php:384 +#: inc/tag.class.php:10 inc/tag.class.php:410 msgid "Tag" msgid_plural "Tags" msgstr[0] "Etiket" msgstr[1] "Etiket" -#: inc/tag.class.php:65 inc/tag.class.php:279 +#: inc/tag.class.php:66 inc/tag.class.php:305 msgid "HTML color" msgstr "HTML rengi" -#: inc/tag.class.php:495 +#: inc/tag.class.php:534 msgid "View all tags" msgstr "Tüm etiketleri görüntüle" -#: setup.php:113 +#: setup.php:123 msgid "Tag Management" msgstr "Etiket Yönetimi" From 84ea6780ac8810aad77f67af22709fc5f8a9d37a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 26 Jun 2018 11:24:10 +0200 Subject: [PATCH 7/7] Add 2.2.0 version definition --- plugin.xml | 4 ++++ setup.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 130b494..b8c6811 100644 --- a/plugin.xml +++ b/plugin.xml @@ -25,6 +25,10 @@ TECLIB' + + 2.2.0 + 9.3 + 2.1.2 9.2 diff --git a/setup.php b/setup.php index 63a16f4..589e8b4 100644 --- a/setup.php +++ b/setup.php @@ -26,7 +26,7 @@ -------------------------------------------------------------------------- */ -define ('PLUGIN_TAG_VERSION', '2.1.2'); +define ('PLUGIN_TAG_VERSION', '2.2.0'); // Minimal GLPI version, inclusive define("PLUGIN_TAG_MIN_GLPI", "9.3");