From 3ff9fc280e45ac361a25280058380ba7b9fe1be9 Mon Sep 17 00:00:00 2001 From: Alexandre Delaunay Date: Wed, 27 Feb 2019 15:11:55 +0100 Subject: [PATCH 1/9] load js/css only when needed --- setup.php | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/setup.php b/setup.php index 49fc138e..e4529202 100644 --- a/setup.php +++ b/setup.php @@ -131,11 +131,6 @@ function plugin_init_mreporting() { } - // Add specific files to add to the header : javascript - $PLUGIN_HOOKS['add_javascript']['mreporting'] = ["lib/protovis/protovis.min.js", - "lib/protovis-msie/protovis-msie.min.js", - "lib/jquery.tipsy/jquery.tipsy.min.js", - "lib/jquery.tipsy/tipsy.js"]; if (isset($_SESSION['glpiactiveprofile']['id']) && $_SESSION['glpiactiveprofile']['interface'] == 'helpdesk') { if (PluginMreportingCommon::canAccessAtLeastOneReport($_SESSION['glpiactiveprofile']['id'])) { $PLUGIN_HOOKS['add_javascript']['mreporting'][] = 'js/helpdesk-menu.js'; //This need Ext js lib ! @@ -145,9 +140,21 @@ function plugin_init_mreporting() { $PLUGIN_HOOKS["helpdesk_menu_entry"]['mreporting'] = true; } - //Add specific files to add to the header : css - $PLUGIN_HOOKS['add_css']['mreporting'] = ["css/mreporting.css", - "lib/jquery.tipsy/jquery.tipsy.css"]; + if (strpos($_SERVER['REQUEST_URI'], "plugins/mreporting") !== false) { + // Add specific files to add to the header : javascript + $PLUGIN_HOOKS['add_javascript']['mreporting'] = [ + "lib/protovis/protovis.min.js", + "lib/protovis-msie/protovis-msie.min.js", + "lib/jquery.tipsy/jquery.tipsy.min.js", + "lib/jquery.tipsy/tipsy.js" + ]; + + //Add specific files to add to the header : css + $PLUGIN_HOOKS['add_css']['mreporting'] = [ + "css/mreporting.css", + "lib/jquery.tipsy/jquery.tipsy.css" + ]; + } if (DEBUG_MREPORTING && isset($_SESSION['glpimenu'])) { unset($_SESSION['glpimenu']); From abac929726cb7f7ca48f3c79fd50839dce281ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 8 Nov 2019 15:10:12 +0100 Subject: [PATCH 2/9] Update PHP dependencies --- composer.lock | 397 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 279 insertions(+), 118 deletions(-) diff --git a/composer.lock b/composer.lock index 54e94ae5..da728cca 100644 --- a/composer.lock +++ b/composer.lock @@ -68,34 +68,78 @@ "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.10.0", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "8e7d1a05230dc1159c751809e98b74f2b7f71873" + "reference": "512a2e54c98f3af377589de76c43b24652bcb789" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/8e7d1a05230dc1159c751809e98b74f2b7f71873", - "reference": "8e7d1a05230dc1159c751809e98b74f2b7f71873", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789", + "reference": "512a2e54c98f3af377589de76c43b24652bcb789", "shasum": "" }, "require": { "consolidation/output-formatters": "^3.4", - "php": ">=5.4.0", + "php": ">=5.4.5", "psr/log": "^1", "symfony/console": "^2.8|^3|^4", "symfony/event-dispatcher": "^2.5|^3|^4", "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "g1a/composer-test-scenarios": "^2", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^6", - "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + }, + "scenario-options": { + "create-lockfile": "false" + } + }, + "phpunit4": { + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "2.x-dev" } @@ -116,20 +160,20 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2018-11-15T01:46:18+00:00" + "time": "2019-03-08T16:55:03+00:00" }, { "name": "consolidation/config", - "version": "1.1.1", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c" + "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/925231dfff32f05b787e1fddb265e789b939cf4c", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c", + "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", + "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", "shasum": "" }, "require": { @@ -138,9 +182,9 @@ "php": ">=5.4.0" }, "require-dev": { - "g1a/composer-test-scenarios": "^1", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^5", - "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "2.*", "symfony/console": "^2.5|^3|^4", "symfony/yaml": "^2.8.11|^3|^4" @@ -150,6 +194,33 @@ }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require-dev": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require-dev": { + "symfony/console": "^2.8", + "symfony/event-dispatcher": "^2.8", + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "1.x-dev" } @@ -170,35 +241,76 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2018-10-24T17:55:35+00:00" + "time": "2019-03-03T19:37:04+00:00" }, { "name": "consolidation/log", - "version": "1.0.6", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395" + "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395", - "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395", + "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", + "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", "shasum": "" }, "require": { - "php": ">=5.5.0", - "psr/log": "~1.0", + "php": ">=5.4.5", + "psr/log": "^1.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.*" + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", + "phpunit/phpunit": "^6", + "squizlabs/php_codesniffer": "^2" }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + }, + "phpunit4": { + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "1.x-dev" } @@ -219,20 +331,20 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2018-05-25T18:14:39+00:00" + "time": "2019-01-01T17:30:51+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.4.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19" + "reference": "99ec998ffb697e0eada5aacf81feebfb13023605" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19", - "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605", + "reference": "99ec998ffb697e0eada5aacf81feebfb13023605", "shasum": "" }, "require": { @@ -242,11 +354,10 @@ "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "g1a/composer-test-scenarios": "^2", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "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" }, @@ -255,6 +366,52 @@ }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^6" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony3": { + "require": { + "symfony/console": "^3.4", + "symfony/finder": "^3.4", + "symfony/var-dumper": "^3.4" + }, + "config": { + "platform": { + "php": "5.6.32" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + }, + "scenario-options": { + "create-lockfile": "false" + } + } + }, "branch-alias": { "dev-master": "3.x-dev" } @@ -275,25 +432,25 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2018-10-19T22:35:38+00:00" + "time": "2019-05-30T23:16:01+00:00" }, { "name": "consolidation/robo", - "version": "1.3.2", + "version": "1.4.11", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "a9bd9ecf00751aa92754903c0d17612c4e840ce8" + "reference": "5fa1d901776a628167a325baa9db95d8edf13a80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/a9bd9ecf00751aa92754903c0d17612c4e840ce8", - "reference": "a9bd9ecf00751aa92754903c0d17612c4e840ce8", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/5fa1d901776a628167a325baa9db95d8edf13a80", + "reference": "5fa1d901776a628167a325baa9db95d8edf13a80", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.8.2", - "consolidation/config": "^1.0.10", + "consolidation/annotated-command": "^2.11.0", + "consolidation/config": "^1.2", "consolidation/log": "~1", "consolidation/output-formatters": "^3.1.13", "consolidation/self-update": "^1", @@ -319,9 +476,10 @@ "natxet/cssmin": "3.0.4", "nikic/php-parser": "^3.1.5", "patchwork/jsqueeze": "~2", - "pear/archive_tar": "^1.4.2", + "pear/archive_tar": "^1.4.4", "php-coveralls/php-coveralls": "^1", "phpunit/php-code-coverage": "~2|~4", + "sebastian/comparator": "^1.2.4", "squizlabs/php_codesniffer": "^2.8" }, "suggest": { @@ -364,7 +522,7 @@ } }, "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -383,7 +541,7 @@ } ], "description": "Modern task runner", - "time": "2018-11-22T05:43:44+00:00" + "time": "2019-10-29T15:50:02+00:00" }, { "name": "consolidation/self-update", @@ -527,20 +685,20 @@ }, { "name": "glpi-project/coding-standard", - "version": "0.7.1", + "version": "0.7.2", "source": { "type": "git", "url": "https://github.com/glpi-project/coding-standard.git", - "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03" + "reference": "dbba6566e1ce7f7d0778794cd6e93bc07080c8c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/1cef37d764aecf8fd7d5d167db25da97e289cb03", - "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03", + "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/dbba6566e1ce7f7d0778794cd6e93bc07080c8c7", + "reference": "dbba6566e1ce7f7d0778794cd6e93bc07080c8c7", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "^3.3" + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "notification-url": "https://packagist.org/downloads/", @@ -560,20 +718,20 @@ "glpi", "phpcs" ], - "time": "2018-06-07T08:45:05+00:00" + "time": "2019-10-31T10:30:33+00:00" }, { "name": "glpi-project/tools", - "version": "0.1.5", + "version": "0.1.8", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea" + "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/5ff99fa5967b468af3d3ba2d7a69ede1214273ea", - "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/39ca503a00454e6c5d7d97bd8baff358d262a897", + "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897", "shasum": "" }, "require": { @@ -610,7 +768,7 @@ "plugins", "tools" ], - "time": "2018-06-21T11:59:33+00:00" + "time": "2019-06-07T09:46:17+00:00" }, { "name": "grasmash/expander", @@ -912,16 +1070,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -930,7 +1088,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -955,20 +1113,20 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.3.2", + "version": "3.5.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e" + "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6ad28354c04b364c3c71a34e4a18b629cc3b231e", - "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", + "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", "shasum": "" }, "require": { @@ -1001,25 +1159,25 @@ } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", "keywords": [ "phpcs", "standards" ], - "time": "2018-09-23T23:08:17+00:00" + "time": "2019-10-28T04:36:32+00:00" }, { "name": "symfony/console", - "version": "v3.4.20", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb" + "reference": "c7edffb26b29cae972ca4afccb610a38ce8d0ccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb", - "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb", + "url": "https://api.github.com/repos/symfony/console/zipball/c7edffb26b29cae972ca4afccb610a38ce8d0ccf", + "reference": "c7edffb26b29cae972ca4afccb610a38ce8d0ccf", "shasum": "" }, "require": { @@ -1031,6 +1189,9 @@ "symfony/dependency-injection": "<3.4", "symfony/process": "<3.3" }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.3|~4.0", @@ -1040,7 +1201,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log-implementation": "For using the console logger", + "psr/log": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -1075,20 +1236,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-11-26T12:48:07+00:00" + "time": "2019-10-24T15:33:53+00:00" }, { "name": "symfony/debug", - "version": "v3.4.20", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3" + "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/a2233f555ddf55e5600f386fba7781cea1cb82d3", - "reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3", + "url": "https://api.github.com/repos/symfony/debug/zipball/f72e33fdb1170b326e72c3157f0cd456351dd086", + "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086", "shasum": "" }, "require": { @@ -1131,20 +1292,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-11-27T12:43:10+00:00" + "time": "2019-10-24T15:33:53+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.20", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "cc35e84adbb15c26ae6868e1efbf705a917be6b5" + "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc35e84adbb15c26ae6868e1efbf705a917be6b5", - "reference": "cc35e84adbb15c26ae6868e1efbf705a917be6b5", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f9031c22ec127d4a2450760f81a8677fe8a10177", + "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177", "shasum": "" }, "require": { @@ -1194,20 +1355,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-11-30T18:07:24+00:00" + "time": "2019-10-24T15:33:53+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.20", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d" + "reference": "00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b49b1ca166bd109900e6a1683d9bb1115727ef2d", - "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516", + "reference": "00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516", "shasum": "" }, "require": { @@ -1244,20 +1405,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-08-20T13:31:17+00:00" }, { "name": "symfony/finder", - "version": "v3.4.20", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442" + "reference": "3e915e5ce305f8bc8017597f71f1f4095092ddf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442", - "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442", + "url": "https://api.github.com/repos/symfony/finder/zipball/3e915e5ce305f8bc8017597f71f1f4095092ddf8", + "reference": "3e915e5ce305f8bc8017597f71f1f4095092ddf8", "shasum": "" }, "require": { @@ -1293,20 +1454,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-10-30T12:43:22+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.10.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + "reference": "550ebaac289296ce228a706d0867afc34687e3f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", + "reference": "550ebaac289296ce228a706d0867afc34687e3f4", "shasum": "" }, "require": { @@ -1318,7 +1479,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -1334,13 +1495,13 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - }, { "name": "Gert de Pagter", "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for ctype functions", @@ -1351,20 +1512,20 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.10.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", "shasum": "" }, "require": { @@ -1376,7 +1537,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -1410,20 +1571,20 @@ "portable", "shim" ], - "time": "2018-09-21T13:07:52+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/process", - "version": "v3.4.20", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2" + "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2", - "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2", + "url": "https://api.github.com/repos/symfony/process/zipball/c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e", + "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e", "shasum": "" }, "require": { @@ -1459,20 +1620,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-11-20T16:10:26+00:00" + "time": "2019-10-24T15:33:53+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.20", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "291e13d808bec481eab83f301f7bff3e699ef603" + "reference": "dab657db15207879217fc81df4f875947bf68804" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603", - "reference": "291e13d808bec481eab83f301f7bff3e699ef603", + "url": "https://api.github.com/repos/symfony/yaml/zipball/dab657db15207879217fc81df4f875947bf68804", + "reference": "dab657db15207879217fc81df4f875947bf68804", "shasum": "" }, "require": { @@ -1518,7 +1679,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-10-24T15:33:53+00:00" } ], "aliases": [], From 431855701c95e06133975e23c4dbff5d49a6b6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 12 Nov 2019 11:03:34 +0100 Subject: [PATCH 3/9] Update locales --- locales/cs_CZ.mo | Bin 4713 -> 4672 bytes locales/cs_CZ.po | 4 ++-- locales/de_DE.mo | Bin 4604 -> 4563 bytes locales/de_DE.po | 4 ++-- locales/en_GB.mo | Bin 4202 -> 4161 bytes locales/en_GB.po | 6 +++--- locales/en_US.mo | Bin 4330 -> 4289 bytes locales/en_US.po | 4 ++-- locales/es_AR.mo | Bin 539 -> 498 bytes locales/es_CO.mo | Bin 4552 -> 4626 bytes locales/es_CO.po | 12 ++++++------ locales/es_ES.mo | Bin 4151 -> 4110 bytes locales/es_ES.po | 4 ++-- locales/es_MX.mo | Bin 536 -> 495 bytes locales/fi_FI.mo | Bin 4492 -> 4451 bytes locales/fi_FI.po | 4 ++-- locales/fr_FR.mo | Bin 4774 -> 4733 bytes locales/fr_FR.po | 4 ++-- locales/hu_HU.mo | Bin 539 -> 498 bytes locales/it_IT.mo | Bin 3855 -> 3814 bytes locales/it_IT.po | 4 ++-- locales/ko_KR.mo | Bin 4357 -> 4316 bytes locales/ko_KR.po | 4 ++-- locales/lv_LV.mo | Bin 4197 -> 4156 bytes locales/lv_LV.po | 4 ++-- locales/mreporting.pot | 4 ++-- locales/nl_NL.mo | Bin 539 -> 498 bytes locales/pl_PL.mo | Bin 4540 -> 4499 bytes locales/pl_PL.po | 4 ++-- locales/pt_BR.mo | Bin 4546 -> 4602 bytes locales/pt_BR.po | 12 ++++++------ locales/pt_PT.mo | Bin 4339 -> 4549 bytes locales/pt_PT.po | 18 +++++++++--------- locales/ro_RO.mo | Bin 579 -> 538 bytes locales/ru_RU.mo | Bin 5690 -> 5770 bytes locales/ru_RU.po | 13 +++++++------ locales/ru_lv.mo | Bin 674 -> 633 bytes locales/tr_TR.mo | Bin 4598 -> 4584 bytes locales/tr_TR.po | 14 +++++++------- locales/uk_UA.mo | Bin 613 -> 572 bytes locales/zh_CN.mo | Bin 2019 -> 1978 bytes locales/zh_CN.po | 4 ++-- 42 files changed, 62 insertions(+), 61 deletions(-) diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index 319c4b3ae9d2d80fe04b45f5c777de66e2453ef6..3aec7337a5377c2edc51e95215aa181993062e10 100644 GIT binary patch delta 482 zcmXZYy-Px26vy$OH_^IeX7(cVVx~rjP~a4IX{k9k30m7445IN84Ml@Ne}GF3j*(Ni z=vFiZPK|AW)G86-_jE5@_&oPHoaelJ7P^IpLBx+ZlH*FplA@E+6rSJ`p5q!eF@rtK z;X5wiFRtTkLRvu&H}C+nc!5Q{!#KX+GQJ@t^_`HfB!?d^_~cT395d))4z183&fqC7 z;uX&0J#JwKYdFAF+~v_c9-$S!#yPyjZET@6_>uI31ZO&!G>;_$duR!DjNv7cqXwq2 z8O9&cCVUR#Uucc~p$(Ku1$kNIN}HiOXnECr4z|KG{9iRr@ZUq*#4Fk)eJtY;t)U`S V%re@96^x?Sej2-pwd?LMJ_1@GFR1_k delta 521 zcmXZYKS%;`6u|M9hL)9CVG8}z{8MNLcSeLpLsSqE(NN&vBIw|dLO8WJ1g-7`(HsrN z4G}GEE;Tf_wj?b@QxWuidAEFickkZs{dtJL#ar(^jg(8oQ zilcae6L^E;_=G0DVjhEB7QrgUu!&mO#vtBf7N1cY90)YJ3F$z0(j80@sG%mDp$A(? zj@;rHww?G3>VzLoJT%g6bPjc(9BSSc@{8mhE2w$LdmMCym-xSG?B~6Mx`{8;Nq%tw zqpU$2+I2iYov?ttShDZjO;2*)SU)Nk>y=v7*eKS^xk$#evWA&4tfh!$=B(wk$zyN& Ge!PDTu{p2+ diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index 4dd996a5..6140e706 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" "PO-Revision-Date: 2018-06-28 11:42+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/cs_CZ/)\n" @@ -24,7 +24,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "Rozšířené výkazy" diff --git a/locales/de_DE.mo b/locales/de_DE.mo index a1ddba782c408e461f73afe510835fce619672ab..ecb64dd3be950f0be452108ecc97da4b2ba31f0b 100644 GIT binary patch delta 482 zcmXZZJxjw-6vpu`tTAHn0d7v6eOPf|LNbeEEbF`bSr;5>O1 zCve~8bDSdI;}X8%BL1TF2N`J+x6qzDMjvZ9jdkSGb4Hzo3oZIEC@BSHFZ~n462gs5fVj62^y%DK;FK99`#6k;`=#P3G zq)<j`BR4SOoW7Gy7Q1^L5ZfP6;Q0t>?q6e{X5~m9cbYT@8+%owbgXAmJ zPH)WoBWg$Qs9)+6`Fqkb^FQ@Fe=U$)vFG\n" "Language-Team: German (Germany) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/de_DE/)\n" @@ -23,7 +23,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "More Reporting" diff --git a/locales/en_GB.mo b/locales/en_GB.mo index 8f172f98e985546915043bc59c0901016dd6b639..5236e735cce288cbef6af87c76883dec9096aefe 100644 GIT binary patch delta 515 zcmXZYzb`{k6u|LQyoRc$sNW^mz#w_?ZbhPvuyl|xU^8JTX$K<2(B*9ngF#~P4>X+` z(a9(lk=QLFF-SB9gGDXACth-MKlh&8d(OS5VeZWJXC#=5h_u8+wnb#VQzVX8$dC%t z2;N{fK4A)9un(I!fi9N}`Z$E^IF7~8Gj!NjaTIIVg^zIwB*EgDKo5Rk2mazBI-E*k z4)ww&(;)7J@c@U}U*ZbZP#@I90Zh67g=di=8KyB@M*YC98;JC>C=t+?pQ9$IpeA_0 zD88aT>>c~@3#lPd+A@tv3(FkRb`$rE!CLZW6WdOc-CN-?o;c#@ooB6pji9`(AG6IG;6X-)1~(J)1Vx&-%80 I8hdm80Qk>0fdBvi delta 537 zcmYk&ze_?<6u|NGD#f0rmHp7lcx5;guig_vlxnGl2%@2(ATk4?hKj?8Q!;zy+Mf zK0HK*TrdsdjTgVeIQv&z#U|>7l3|enTt+RtjSSgiO5h1<1J~g)MOjn{=*^!{6Vy=? ze4`%&w67P7U_Zu@S~7!^IFB?X`>6TOP#e0!0Nx^xCspLJk1@+t-YT->UUaUR0U;0xU_Tp)=P&zn1vX=^_V$MoCZq|0vwmWON VPR`9tIee8lGZy?8tmVy5-ybC^IQIYm diff --git a/locales/en_GB.po b/locales/en_GB.po index 09904846..c597b30d 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" -"PO-Revision-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" +"PO-Revision-Date: 2019-11-12 10:01+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_GB\n" @@ -22,7 +22,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "More Reporting" diff --git a/locales/en_US.mo b/locales/en_US.mo index 99ecd88c7f1f635d10552471aeb4f7d77670c45c..e4d4e1a0f190a57197f1d69d459e93a3f4eb5f6d 100644 GIT binary patch delta 482 zcmXZYzb`{!6vpwVeq5B>s`?cw+@(aqpJ3^t=_2W1WD+q|VriGVG*$+q!NMXza;GMe zMhp!802@;Wu~<8Z?;|&P^M1~K^WO8GbH1Xd=;1pP-)5wNth6ubZd{tcJR6}(xPWVz z#|oCPjzw%>gl$~G8=S`%EaN9G<47nC<0>xV2C`HQ6>E}Um#+dI;uyAY3)?u2&&bj{ z+Z^`N^Ivp<#hg^bO>{vmoW)D@!wIs~VOzpibOXIyEKL#gIdJ76Z8||2onRXS+(Q?3 zfHT-Y7j%m2c!4ylE;`>Ex}gso#UJ!U`^c~r(6#dyb_o7Qj2>A9{m>B(;R*U;6Zu!? Z>G>7<-ZlE+`}F)V=?tC)$#J$B`~keWE(QPq delta 521 zcmXZYJxIe)5Ww+^AEB+*_^njMghB-+m=yd9;-Z}#tRTADp@UE=mX3uux)pKi;9}>Z z(5ZuigM*7Mf(}lCAkskxcmF31kN3Mg9{29<&iQg~+D7bt0JWexj^jP*!*9rvceWY)L2baYLXlyDB<*SC%cu! ziD#&VRdEb!s0Cf)Jl-Nr%O`5SU(|*obQi${>O_;suw@Z7e~=~kA2I643aAfVU=LoR zUc5qbN~?4JfO_u{_2Jjf`A4(WT{TmC?q(^UD<2&f-K|_XAJ}QnUvs^*>o3{97x*g+ K9$zyPtC)Xe<2Vff diff --git a/locales/en_US.po b/locales/en_US.po index 66882f3b..3b83c34d 100644 --- a/locales/en_US.po +++ b/locales/en_US.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" "PO-Revision-Date: 2019-02-07 13:56+0000\n" "Last-Translator: Shawn Long \n" "Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/en_US/)\n" @@ -23,7 +23,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "More Reporting" diff --git a/locales/es_AR.mo b/locales/es_AR.mo index dfd1477d2fa1a0798a7a288bcb5479020718f4e2..8b7591c8529636f896e8002495c20279ae2b6a13 100644 GIT binary patch delta 15 XcmbQu@`-tZ3geE6s!0Nj5MzyJUM diff --git a/locales/es_CO.mo b/locales/es_CO.mo index 17ebb96da5f0389c88844caaf76c096236563166..5e783858aff6ffd2809a7284887d5d15accb4b1d 100644 GIT binary patch delta 1448 zcmXxkOGs2v9LMpKGn$$9u!p_7re$TLqtkPGU=%$}3amB})otcBUU0l}XEcyth}=Zb zq9~|E84-o8VsKF!1V*)spoA6`Zla(?LJJFuzQ1wi;JKfB&YU@q|No3{YOd90K34{B z7)q47jQV4mF-LGDz=JXwH0BKc#&SGSY|Knd;1W#XY`lv4{vDi$!&r@P(ZUH_gq0=6 ztibvyGp3anJ~J*ZMGq_R3eLe>I2Q+T29Dq^e1-F|c>2`%C0Ip!Evml-7vpg}gdS=` z!?+MXVX?^=^NW{Rbo{~PIHPpx1a(+Rdpm09hfxzGP!n86_Fx838+(Wg@CoVwuW>zo zKt)c2G+zbkKo*v=zG>z~A>EE;xF5AZJ1WF3uEBof&phTqHp~!e+%r@P-sStpkw5d5 zhZg>s@BfR>rx{bkBE9s#V9|_rw1rU$Su57!X;kR?aW&pSZR90xz%RHK%Q>btwh33_ zNnC{&P$|8Oir52GgkPi98$+%4y@L1?b@PvoJy^mhP0)%uSrT=rE&ohBvYMlH((9zC~Cb^s0d!n@S>a#qAt@AYQhmz$j9>i6R4a{ z<}D(Q3UN7-QnQ6xC_2ctLIX7qU(1z7o?EF_uEnoIMyczl%B@Nfl}l?jQnhOpg-Z*n zC?$%DPO74u>NNWK=^m`VzB5>r*~D9zs(9)aD4sg|W@-bqQ1o9zw@eAw?W?Eis45|< z5~r9eOu7VxLhf^+QsPx~F;qx}X;L(mfadJSU~N%(ti$%x);Z5l+Ue}ClEy$L)b8}U zDc9=??X}ZR)M^elZ3~4rhQbl6ITDRT>cf<>HanFL9rNw3RHvQx{HS%ncH@q39qe>t z9ah_Dw%h5mcKeRoXIncuIz5^#ZaU?4_QaUlNj1d0By|@PbtQW2gcCaE*vY7MG&@js mDNwyHw;|7pJ66IUy?4%yc~-aY#GSO`C*3YPo~@qsFz_FX)uM#} delta 1385 zcmY+@Ur3Wt7{~FWTUs-xnW<%emQ%~@t!?>d?jkVl#tfyb@S^lhhe$bNE(-)lK|vuA zg+);jK|~}K3`8i1?56O-t1yU)z(DUJ=%#M^{`B2Nhn@Fx-m|m!Jn!?I-6((WPkt?M zj~iM8eItE7!Bn3zXJp1IPP0xUvBT!nhTKGXwxkv+`_DxizF4#!XdJ;ELM5|y#f zsOK%9UgR(GF}eIWhy6_v0}qy=Hn32sZN^IMLO$j)7ph>cqt=b1Qa|C$zeYahEf;M( z~*yzUmP#WFmC zO6_@6#zxVL4^bPwKJK+v23aB;#yBvnbNI+fr6=~@7H7|T_;j+s%X^|j5btLs+1MIshVo3 zvZ!P#SJlmf?&4$(BQ@o7H(mMEDX67e^mJ1pblOy4CYUZD^EUpx>56` zqEFihyGg^wgPolDC`S_BQ?S0b*=VL!s>|Iv7ys;VlW=@HNAV<8}IM& jHO695Ppcj4J8Snvt&XTY5b+&8W2ZiNF1S(y-p8(gmtKe5 diff --git a/locales/es_CO.po b/locales/es_CO.po index 7d80c5b2..3f6abf9e 100644 --- a/locales/es_CO.po +++ b/locales/es_CO.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Haider Ilich López Areiza , 2018 +# Haider Ilich López Areiza , 2018-2019 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" -"PO-Revision-Date: 2018-06-28 08:41+0000\n" -"Last-Translator: Cédric Anne\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" +"PO-Revision-Date: 2019-04-03 23:33+0000\n" +"Last-Translator: Haider Ilich López Areiza \n" "Language-Team: Spanish (Colombia) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/es_CO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +23,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "Más informes" @@ -106,7 +106,7 @@ msgstr "Clase" #: inc/config.class.php:157 msgid "Default chart format" -msgstr "" +msgstr "Formato de gráfico predeterminado" #: inc/config.class.php:166 inc/config.class.php:769 msgid "Send this report with the notification" diff --git a/locales/es_ES.mo b/locales/es_ES.mo index bdb8631641d71ccff1e2fc26897c5839416dad11..b6f68d6e9fea41d09017137dbbe65c24c643adb2 100644 GIT binary patch delta 434 zcmXZYJxfAy6vy$Ol+sP}sS?t#n;?c`y0kU+2813U5T`alT3YTRMGg4|inc%+5*&i4 z!AWTF71$Ou1~y2!^gZ;4%l(}H1LvIodGfFQ-b*OxgrwgEsVV7dQA*$pS1=ltO6cP% z?qLy+F^g?1;~j3{8|LvFH!vNO3b>77tf8GBVI0q53X~?eWW&Q7%;3Gd_=;9|jMm5m z4>7y+zdl7i-SW%f1Fqu`?ExQd{e#v>hN{-U4)SL0#{(%vP-kNqTeyiASivsZ`8%%R z7g}PEF@zC}&YHTaAi+?|RT5sL_7XJMma5g|nyU!?XBgn)>jKy0kV z;1ycfDt4k+*b53)f}NHBA$KhIn|-h|J7?zB)b3-!T} zO4bWW;|B9WG`~QGJn~E98)ona^#Mt;=sb&B$RcV1+sK>cC>4mb6P&QniRU`u-fVun#c)k&-c??|3uDbMxNpq{|mB#9!=xZ+J{CI!C<>hf|wfVKR_bVL}I+vAQ4S2{sez zINjf2i~Soe;t#scOhuZNNIF}%Pk-e8Eg==&j(?e8TADf6<= zn;76G9%2XQFhK`=#R7g{4ZqMq{S((&sYZ0kVv7SOJ-{ZO;xb;N3p^l0(lh$Q7jy>$ zbbwEE#|0jqTpb&@feb@?sa>QO9pM6=@3ZhoVqC*VbY}x};%{8S?8JX(0eY0%=l~(Q S;BI=}O`b-sa!Ie$$o~Qr>?+6r delta 521 zcmXZYy-Px26vy#niIsJ=H^biSreug*xL1(KB`RBrz@e!kP%vn)D1?HBi-TJb6huqV zpHMheaOqEIXsf0ggT|JIz6Y;^pXWRe_wYOCGkKP}`wqBI0g;Zd$f1aMy(0Z+_lb<+ zBF^9z4r2pn@d{(;`SmNNsQ)m5rqS-RfD_au3}FrRy^cM2X^1OB9B#OX;5|n18H@OW z`X1wvY?46@l1IH?#U$?FCN^*k-%$hpVmBHz9mEmTpc&LY>rq!E&Y{AECOySzyhalr zQ5(D=OOh|t4}VZ62(m5>5JBCX!=G+$3CD38S&E$aHj$a+0w?jd#6ef$VH!VBCkqa= z6UT9iI*U5l8tN){Q3KRa8y@@j&DKNbc__VMEgx0O^}U0At5~jA3uexC<}EvCIeF8u P3(j2D=GR&YC%XOtBL+3j diff --git a/locales/fi_FI.po b/locales/fi_FI.po index fc4e72e8..ac462dc7 100644 --- a/locales/fi_FI.po +++ b/locales/fi_FI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" "PO-Revision-Date: 2018-08-19 06:25+0000\n" "Last-Translator: Markku Vepsä\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/fi_FI/)\n" @@ -23,7 +23,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "Lisää Raportteja" diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index 2dc428e3bd8015535ac765b22008f92c218aa76f..dd54b0e4c62c4d30a706a99b8f2923ad47e95470 100644 GIT binary patch delta 482 zcmXZYy-Px26vy$OCgw}pRkW82QJD@YCJ9o|9u)-AUl0+rv;+|?c9&+Q$;m}RXo=uX zZ8b@=i(9l6)Z7q3-$NH3?&qB6p7T71XHfbrK759}c1Q{*q?V+cq?E#V0J`5Lx<4$y1)-hio1*X)ebK9^e+*L2b0b z?r{O1aTZ^34!`jP9hxh6iEDU^5geg|V=Utb+BrGLlV%9&{B>~`?ZRWUf@`$N`xwVN zw1IuJ0bXzu-_QnhGynZnw0s|VR2?Eqr+g^Y71|4Tngm4xA6IdV))1!KE>7bz=Fu8A Za1wWrQZ)mQFh+jvKTdR_{#l|C`vU>UF8BZd delta 521 zcmXZYze~eF6u|Kpm0F|Lw%|_?qo#s}XcCa71zn<(i%4;Cv0xDwi?s+2l37HY97SB} zBnTaF;S|1L3_mf0Eo8`0LP8lNFcTu9n8yJu;0ErX zI;erFu@4-_FC4}=n@7;VUCg0{H#m=P*oD8CM2%?<)2Pl_N``bnu*Jd{R#07d9&NZo z)%h#-;5({@o2VN2K_B&0yTJfe{brOOA&)Aj$dF4WO5_&R3qPzAm;_CnMUCH71s1A{ zvp9*%s0z2S8xN2YIgUKTIQdomvGXD}Q?P?dsaV}B@7pWIYAJ7cj+?U`&vq9L*U7tC L%i*i9>VEtmsP8!c diff --git a/locales/fr_FR.po b/locales/fr_FR.po index 218bccec..0e607a63 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" "PO-Revision-Date: 2018-06-28 09:31+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: French (France) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/fr_FR/)\n" @@ -26,7 +26,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "Plus de rapports" diff --git a/locales/hu_HU.mo b/locales/hu_HU.mo index 7da3cfd71e9e7a631b71d6427e073c59a8cf38cc..1d28e9a2333edf30dba4bbe143faea816cc9baab 100644 GIT binary patch delta 15 XcmbQu@`-tZ3geE6s!0Nj5MzyJUM diff --git a/locales/it_IT.mo b/locales/it_IT.mo index 33110f259229b5ee11bab274b38acc1f55eb06b1..b8c3722f95d3ac23554d3c1575cdd2ed61af22a9 100644 GIT binary patch delta 403 zcmXZYJxD@P7{>AEQe7-l%!~OEDwaA)i@4d|*cb?cL~E0cav>+DXle->B5cgAc;{$t ztj(dt#fJ6}{J$t1&hMO;!+Ae$3$y&|gX6zB(rHAxl=QzXC9$(39by-=c#lUo!W@2K z75}h;>FCN6EO5WTINqR#cesboND75`fbUWHDsq?-NZ|rA=\n" "Language-Team: Italian (Italy) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/it_IT/)\n" @@ -23,7 +23,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "More Reporting" diff --git a/locales/ko_KR.mo b/locales/ko_KR.mo index e1d535e59cb79add45a1db2e2b261498453da7a3..b8e83ee7d3ccd049e2dbe28e1fca32ecfb638ddf 100644 GIT binary patch delta 450 zcmXZYze_?<7{>AE5*X&yl70|Hk{KikC2c{2P+NaOLk>YhZPL(CH-u_vu&p(MCLIDH za0nuYK!T=-z(M>2f)5 zLPd0Q6~#$6L2wX62f@Wj{9lt0-tS%RD}S#LoBGqM79i(9TCa2h_vHrVl(k7>W}L< zfO|NOC#W~{j2-wM#lOf5Vvy8)FN?;bsCA|zmrxs*QTra*Z1gJ5P$#^I5|5|_-XgzI v&;8Z58|UKLWov%ZEBR}c4Qrv~d#+iqomtB+Sk9E`*se2^w|Qz;Mz-l6$G|s5 diff --git a/locales/ko_KR.po b/locales/ko_KR.po index 5e10c588..62ed4f35 100644 --- a/locales/ko_KR.po +++ b/locales/ko_KR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" "PO-Revision-Date: 2018-06-28 08:41+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: Korean (Korea) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/ko_KR/)\n" @@ -23,7 +23,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "보고서 더 보기" diff --git a/locales/lv_LV.mo b/locales/lv_LV.mo index 86cdcdcda093acf98bfac36ba3be9bbd63b9601e..aabc5ce9c968275ab9369bde5aa0de4d1d18bfe6 100644 GIT binary patch delta 434 zcmXZZJx{`56o%mk1R`4STU#{YjrbkY#lg`y7*`S|2|KVkyVOKC{Ru9P4w{m#3=R&? zPEI5a;@G$n2k#R|nqH^pO;4Yke!ISl`qQi5vc^xd^Z8?(WDeh?43lGSp9=8x*(E_Dt0kd;seYAdv zwy9IJ%{9=1wI|-=4$nO#n?8|cYls_|Itm-?k)nv3$Y0PQ=I}VVnEJ^l-Qr*2AE9n4 Ad;kCd delta 473 zcmXZZze~eV5Ww*Z+G=ZU{cWs*57df=NKy!5!NKYvI0;G-I@qD04z)-ZLCD}gp#BR^ zf`U-py1FB={2M1Rj^n0`+@DdGPVG(T&nFKR@}8xt(-Gi&tG!Atm_BH_j3NC<8jrOV}H?qds8%w diff --git a/locales/lv_LV.po b/locales/lv_LV.po index 58dc6c63..39a7b045 100644 --- a/locales/lv_LV.po +++ b/locales/lv_LV.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" "PO-Revision-Date: 2018-06-28 08:41+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: Latvian (Latvia) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/lv_LV/)\n" @@ -23,7 +23,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "More Reporting" diff --git a/locales/mreporting.pot b/locales/mreporting.pot index 2cf1e2c5..ecc974b6 100644 --- a/locales/mreporting.pot +++ b/locales/mreporting.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "" diff --git a/locales/nl_NL.mo b/locales/nl_NL.mo index 845c74347121f34734d16af5b1bfbb626430474d..597eae4d8f19172f5c9fe9e27b9e2cd793873ef4 100644 GIT binary patch delta 15 XcmbQu@`-tZ3geE6s!0Nj5MzyJUM diff --git a/locales/pl_PL.mo b/locales/pl_PL.mo index f2029c791455935b18bee45c58600cafcac8b1d1..4a2c192b015e50e50855a9fd81408ec83804e403 100644 GIT binary patch delta 474 zcmXZZJxc>Y5XSMxn4B8Ti|1RSVu+_03oWdy6a>K{Noyg*GT13fiZmCnl~{;2egV%) zOeF~Rse-k!3dBl3fQbGF50?4u&T_M}d(YmL_s|>g^AV{#B9$fmj!I)#Cd}di=CFnn zcoVMg!*v^1$iL$vItj_cRh+{TF5?l#@Dk_o8u>(z3HfrFypWi}S9I_Lx9|(6aXl$z za2F@Bg4WFqJGCyUai6)GTqLz`$%wSx>D Z66{7Np>>S2KF26FTft!6X%*wgLw|*FF9`qu delta 513 zcmXZZze~eF6u|N4kG5KjZT;2y0}ZBDL4rv^#0oAth)_Wh9h^E8DnbP<3NCRF>L|L2 z;^0(p5Q@}6bnzchM{yAc_fF#C_hG_upWIz?_ujiR>%qGHYVZ~tMLt?ZmPBN%O@t=< zbbWY)LwJRq_~eh@{Ba#enGYEv!#IH!u3$gz;Rv2$0Pk@CACX_>-4IVYc==|c8-Fo~ zv38MJOkfYLV*-oVg=N$LFEEQW9K=9`Bru6Bn8g^bp{^HD&naUZFC*T6q<2hcCNHQ5 z{-6dDjf$|h#8D4Up;lxDlemF=Du<{6o}dO+L2{92fBh9{@=4c=b<}-~1;W#k*{B;W zBex+r)KYCBO^)d_qjTSD3^TsLW~@~!O$Wi$sy(-p&y_Z}i}rl3l+T!H$DOvFwCzrs Qu9I=6#vPuj8Qu;30l)q?=l}o! diff --git a/locales/pl_PL.po b/locales/pl_PL.po index 58cb854b..e2f1b6f0 100644 --- a/locales/pl_PL.po +++ b/locales/pl_PL.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" "PO-Revision-Date: 2018-06-28 08:41+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: Polish (Poland) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/pl_PL/)\n" @@ -24,7 +24,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "Dodatkowe raporty" diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo index 7f3edeebfe2f547219ab2f17aefe367db6c4f1b5..28fec6b8c7874f6572dcad9421be46bfed741e85 100644 GIT binary patch delta 1414 zcmXxkOGs2v9LMpaj;7`#?P2+-TRzi9NA2a9CZPo>J;W9TK{p@ckmI$PsZ}tGg6Kg( z5!5Cu7eUg(1_{(vg04bZv=Az)MM1PMkRC$N_czWQ{NK;LXU^Pn&i{YL*QG0^k&pSV z2ZrV)iisad#vI3)6fU$sE@RH&U(CWYsm82D9~NQ=bMX%9`;T!wPUCi5Kns83X3S4B zW-HdL8Zk$?;WOjMB6KhtZ{a$8gn9TJGjIl5aSk_N>YCN@g;>CI6{^1tx8N!4L`5(jukAyjP%tVRAN5Q&8U?hL%qO7w;2x@|EREqsrf!B~fGtPx-m`T*QDO3sG#``}bf95L} zO}rHE|A#M=j7esai}X)2X+$ZjWRzBP5KHkS>cy9^3~!@KGl5n32FvkR++w!7jpsvX z;dxYMuHr7diOTRRREFkIXXJf0`PaZDIy&$-YN8fKb8AjxEaezWIVuyQcoyeT3n^#& z%2X#RGXtoza{)bg1$7o)pvKLk4&j$v@~<5xFQ|8D7#CkwY4flWOX7B*&PE`@jcWc7HSri~h2y9f&Y?22h&LchI6LTS?J zNi=F7E2<8Jn)0hg>P@|}rUEoX7hPq^S-pdHFl-Gt!GIl(E~nL{^t!wIFZ)A&XV~3t zhx@%&gQvd9?P+p1daU|JZ)1IphnCr8hr;fjpgkNKvcpc$YxNBJZJ%SEutOm`U=RDP z1L0WDNTQ?77qI<9wY^TDHF`JmUP{s7*rblt*KhfPvrh*6y^b|v_XTIioT!!aH03|= Ca+iw$ delta 1385 zcmY+@Ur1A77{~F~ZD~!XrKXkrIXbhkoO+h6Efq`DsT{m^p_ov%M59d9fv$OZS=Y5~&J%7CO-qg2Z z*OVbzX1<{49p6}TCFcmz986SIF6`we47geaK-haiR+5DyrWUD)qCO`*X-)UUAZk z-)8QA!e=?ge8uzJze)X+v3xqEG$St;UJRlJ?!{_6hbqYw?#4&B6Tf8Ca(D2%1}!{{ z%FGb%#TXXiZB&M4P#J!S>i5Az{tt1nzzq&lNpGdP0X30hs0^IKlQ@Z*z)w_$N?5)! zQjgjzjp)O6)E*c`^_xU(x*62M-k?hUtBCwlc2mI9+B~JGjMSoLx(@@`mHB@hmAV_K znm$0XYUYuon0KhJ<1_BU9~nIisyz`zmAW7G-qXszW|%+?IDtydG-}|x86Tr|?Hp1{ z(@e{TKD$u%2WsVXTZwwkEi{!W8~W5$&N`a1ZyYr3$VOTfO`%EYg$kug+0e=qny6N% z5-F{<*N(c%Q%zhcw5|r4@~L75X*Mkz+EFTkc7%4F@}i|Gv}=@K, 2018 -# Thiago Passamani , 2016-2017 +# Thiago Passamani , 2016-2017,2019 # Thiago Passamani , 2016 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" -"PO-Revision-Date: 2018-06-28 08:41+0000\n" -"Last-Translator: Cédric Anne\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" +"PO-Revision-Date: 2019-09-30 13:31+0000\n" +"Last-Translator: Thiago Passamani \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +25,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "Mais Relatórios" @@ -108,7 +108,7 @@ msgstr "Classe" #: inc/config.class.php:157 msgid "Default chart format" -msgstr "" +msgstr "Formato de gráfico padrão" #: inc/config.class.php:166 inc/config.class.php:769 msgid "Send this report with the notification" diff --git a/locales/pt_PT.mo b/locales/pt_PT.mo index 6be2c916adc831f5bfb134f09f28017bcaecce3a..6c06c057efefcb3993c398899841a2359c927916 100644 GIT binary patch delta 1567 zcmXxkU5Hd=9LMqhzNx!8uC1x1sn7bdYi_gcj_$VZng~Tfwkq3uAavL{GjnKW&T#f9 z8$olSUGzc_Ll@qN+D4^z5ra3aP%vnh;)NiAf>A-yMN$_TNPT~^XCCI6&v~AG=6U)5 zpR<4UU)ff@-Pif4Q6{O6QvYZ(JB*h*_@eyNY4#@G!{`Awegm$j zy%W`c03X4Z@gRn%4K3n2yoFs>HT#=~RdoD|o3MMu(g_B!kMgeuElRq2lxSZ;SE&eG)VKMPzQ3jg7q!KgF-rmJ@_1Iff-bY102AU$j2`5MKBYT}Pj5n4dfXBQGLq28MBkd)e!)K*c%_O=?RJH)VNd4lf=s%y4LjnuoZygsf5 zrJbr%?4fR>s%TSMP(>%uX>~FcMM(EV8&>+13T?Vo$g1hz$ryEns)H(xq_k>Vc^Ib- zQ(Hy3(#6sxRM>{7I=xDosvIf}ikx1#R#DFN&JQFV3b6`Nw^6E6lA)^Tp7dJ%bm#i^ zm9qseid`;@N?u&Mxa`VCZ{B77N?dS$IS%5tUC}@87i~H$$Ax;h{I|9a-+!z2O80E- zr|vb+>`jkk(wT8LnwcCO9~z6ap}JXiGMFq(8T#{xI)7elx2cu?`9F$PuQ z1No8{6o+TS(*F96o_9O8Jlots$l5L+HO}UO+0a!YKkMg$a*z#c=TdumnXplhg3#st z$SbC6Kc~JNKGgV{{kc-(?0isa{#^Ucdd$P85{0>A4^|y+?|;!Rd1cR@ Q4oi-K;hfQtJT0~V2b5sKcmMzZ delta 1359 zcmY+@O-PhM9LMo-T{E|KH?`C(>rqQfd+OQsCEYL(LkaB#6C}F0=u(EQvb)$N+MsJE zm!c4AXegewD1O&;T&$m zg|tcYoen=!xQ5BF6usDh8?YS19>CL?zu!R}!6PsE*T8qYP|BC_Bzl-l0SuugzCxo*Gl{xnbEuz+= z76y@1Gbd0xKZOeHT;}-_Ht;;*C;uAonisl6A5a0UAg5s5+(0&Iyhyf8IclLAR6yOR zK+mGibON>T6e^>4QS&}SPQ`r8_yu+8za{B#WX7Q?BBj|yRoXOx(xehhW2#Y^(jwWS zyQ5bpAiP2cd>UeQ)C^kH3wMV0o*_)n=xv4f^gKum! bmWWtgkyv=dvaM9oH$B_$KjKQ=FD(BDGIEDA diff --git a/locales/pt_PT.po b/locales/pt_PT.po index 99377895..04528ce2 100644 --- a/locales/pt_PT.po +++ b/locales/pt_PT.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" -"PO-Revision-Date: 2018-06-28 08:41+0000\n" -"Last-Translator: Cédric Anne\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" +"PO-Revision-Date: 2019-02-26 12:16+0000\n" +"Last-Translator: Rui Melo \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,14 +22,14 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "More Reporting" #: front/popup.php:38 inc/common.class.php:1143 inc/common.class.php:1150 #: inc/common.class.php:1158 msgid "General Report - ODT" -msgstr "Reporte Geral - ODT" +msgstr "Relatório geral-ODT" #: front/central.php:73 front/central.php:80 inc/config.class.php:660 #: inc/common.class.php:325 inc/common.class.php:392 @@ -105,7 +105,7 @@ msgstr "Classe" #: inc/config.class.php:157 msgid "Default chart format" -msgstr "" +msgstr "Formato de gráfico predefinido" #: inc/config.class.php:166 inc/config.class.php:769 msgid "Send this report with the notification" @@ -206,15 +206,15 @@ msgstr "Nenhum gráfico seleccionado" #: inc/common.class.php:1402 msgid "Week" -msgstr "" +msgstr "Semana" #: inc/common.class.php:1403 msgid "Month" -msgstr "" +msgstr "Mês" #: inc/common.class.php:1516 msgid "Max depth entity level" -msgstr "" +msgstr "Nível máximo de entidade de profundidade" #: inc/pdf.class.php:16 msgid "Automaticaly generated by GLPI" diff --git a/locales/ro_RO.mo b/locales/ro_RO.mo index 3586863312f42743b896cb463883aa35de2794cf..5c3cc2cf3b82360f0e73786c6daebccd907c96aa 100644 GIT binary patch delta 16 YcmX@iGK*z`3ey9|iE5D>SIlMv05R_d0ssI2 delta 55 zcmbQma+qa;3KJ*OM72n@5MAe@)Wnj^{5)Nk#FA7i1tSAPGhG89GEy)!u`)8(HZU?U J*jO`<5df{A4&(p; diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo index c335d82d979536ea54c1c24c6de868836c278fc9..9e2ccd4179d5a158fad7438fc75095cf01fa64f7 100644 GIT binary patch delta 1437 zcmX}sYe=2A%f6lXkqApkXwKJ*L z5S5gLlrK|^*@i=jT!>#u#_Yr2n1;I?#!Sa%%*G(5V-M>0S8z5C;!+$%3%}!hbS4|K z7z-y1n_4P-XMDH-{Wt@=F#|8)EWCv&ID{MU3C=;s)QRV_F_ZgzRQo2(!baSJe$<2p zaUQ-xhY1@qPGu$ye{d0|Oq*Ci9y+;ShnjgEs)J@!2WOBum}{ts-Nd!=?RXj8_!T$eV$!t+_n^+od0dO{ zuo#yx8!e;`t8pi4<(E(yz7zL(I{9Bh!zUV)iBvXR9d}_qK0>YhGistv^0pj{u@f7x z7GI(!p2H{_*pKS>IIhBrs6+P*)$d1KiO$)Ksu@>tWJ|FH)xkB?p5I3O;Bnlqr~&73 z!ZaZ-YC;{T3|>bKJc3&3d(@e6a4^a+54FJESb@D^DjH}M$)5Run(h|3o$4jkJMIh*>{QGUZ7j-IfG?7rwp%f4s# n+kJL~hCZ5xqTQDL&>ps;o!kxEgVEEpKd}3wJ&~gsPaXdN3{EtlrR}7xW*F0hGnt%-HM=oqa2>Z`Aj_B>Jc&DS5c6>Y_54jN#%EZ8Z_$lEa68(v zjoFQ^4dceo1^<~-=)wWa#c?daYgmZ)aWl@~VSI(U?>ClWro))6=)yAe;BgF~5}C#l ze2p6K6Xuz?F^gR6qGJ`6xowj%MOcE$xCZrtqo@}QA!C|xR6>_<8{R-A^cZXLIjUmc zQSVzrP2?|fm|PytVSH18 zfaQ#$7uMoI44^jIMbvxmVGYis68(vd=qhG(y`Yzc*IJ)OJrGOz5H;XCR6>R9FePN6 zDt7`k@CDQi@1XX|OKid=RK;@HAo{{OQRBpsqM5t8P{vQN5|>bG_Xo9E94s_rn=(|t zg&C-2N{2o>EkioA`}M3svsD60G95}pldPk4s*}Bu+>wV+Nhq`d^_eI%GbNFu9|YAi z`)K5nEOX86ZhL9GkzWcvqvVvBda@QxXwlN4I#$t`VX}s`$j(egJ!gH)4K%Hbo0bmM zOSMz|71}5Y_J($8cCtR+#Jau8mZ)@8XU6-j_DCog8yO8-9l==0?{4sTTP;t6$P^CQv!?(, 2015 -# Nikolay , 2016-2017 +# Denis Arkhipov , 2019 +# Nikolai Petrov , 2016-2017 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" -"PO-Revision-Date: 2018-06-28 08:41+0000\n" -"Last-Translator: Cédric Anne\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" +"PO-Revision-Date: 2019-02-21 13:40+0000\n" +"Last-Translator: Denis Arkhipov \n" "Language-Team: Russian (Russia) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "Подробные отчеты" @@ -107,7 +108,7 @@ msgstr "Класс" #: inc/config.class.php:157 msgid "Default chart format" -msgstr "" +msgstr "Формат диаграммы по умолчанию" #: inc/config.class.php:166 inc/config.class.php:769 msgid "Send this report with the notification" diff --git a/locales/ru_lv.mo b/locales/ru_lv.mo index 035c34d40e7b3b501590b64a2575d44124b4ad17..faf318ea1560a405b625b773fa83fec8c9dc57e8 100644 GIT binary patch delta 15 XcmZ3)`jcgX3Zwl*)u@dtelY?7Er|vF delta 54 zcmey#vWRtp3S-7Z)hM+PUFV|I#FEVXJYAQ>l2j`NBLhP-T>~I8QZO{JGBVdTFfuUM ISo4<=0Lr8f-T(jq diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo index ebad493bb56e9f7185bb3927d051a4d476e17b14..d4d66e736ad5191a1e07095d8d8b44ab2e871089 100644 GIT binary patch delta 576 zcmZ9}PbkA-9LMqR{;-<;p|!>=rpNjb&>LZ+V8^Q_j^6h=Xv@)-|zGL3cLrdKMciFgNV^8vLqsBEg}rX zY2!gJ#<3qeaULUBz;3+47~bo-$==B0=q68M2$#`r(;M2BO8l|Ad6DLAX; v>gBYSN!82w6-}nJTsH6D`V+2I%#Klm?_XFiXX<7Df_76%YwML6=dtk@q7qeE delta 605 zcmY+>ODIH99LMqhj8|riA;~kY#wc;?-a#{_jJ%2!8D%$h(-b9iJ<5V9vQSD%);3mB zrYR*ml#-g2EM?`9k`!CtWA4T*?&to0=ifR1bLS=S9XNe=rS4oJZjZ>ch-AGYyh@}* z#E%2mg>kIIZ8Y%+8}R`<@yE&AeYre=mE`NF<31MQB{t)&Q-Am*^>@$@K@AH3lN(6K+2oA`#HiQw5; zC@#xw6vP7ZUSviYLRut_>I+O^D{eaLC#VL!K-HIZ>PM`i{&Ms(y&5nu#*5l0h7FiN zE+K2E4&K24?qM~aIe8ZOx8xqxK~Jc@+-K%IZ?|w{LLab`*3!)UoIYqRC8Ju%FuQdl zq?=uuX++I%o59aBHmZ*&S7sLf^+j|eteYXt?1*-BW~M!fyvn{+%bvAt8MhYZZOzJ6 YnKxg*tIR2`({tBpZPi-H4Eqn=zx3N!O8@`> diff --git a/locales/tr_TR.po b/locales/tr_TR.po index f0dc70ab..0da62628 100644 --- a/locales/tr_TR.po +++ b/locales/tr_TR.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Kaya Zeren , 2015-2018 +# Kaya Zeren , 2015-2019 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" -"PO-Revision-Date: 2018-07-12 13:34+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" +"PO-Revision-Date: 2019-07-30 23:48+0000\n" "Last-Translator: Kaya Zeren \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/tr_TR/)\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "Diğer Raporlar" @@ -66,7 +66,7 @@ msgstr "İzin yönetimi" #: inc/config.class.php:38 msgid "Configuration" -msgstr "Ayarlar" +msgstr "Yapılandırma" #: inc/config.class.php:82 inc/config.class.php:688 msgid "See area" @@ -114,7 +114,7 @@ msgstr "Bu raporu bildirim ile gönder" #: inc/config.class.php:252 msgid "Initialize graphics configuration" -msgstr "Çizelge ayarlarını yap" +msgstr "Çizelge yapılandırmasını başlat" #: inc/config.class.php:489 inc/config.class.php:504 msgid "On mouse over" @@ -174,7 +174,7 @@ msgstr "Eklenecek bir rapor seçin" #: inc/dashboard.class.php:223 msgid "Configure report" -msgstr "Rapor ayarları" +msgstr "Rapor yapılandırması" #: inc/helpdesk.class.php:284 inc/helpdesk.class.php:343 msgid "Undefined" diff --git a/locales/uk_UA.mo b/locales/uk_UA.mo index b6304ebd06acb1a4c753bb175af1ca9bcf93e75e..0ca0f6ec872fa73a80011a973002daaf47cb2ec0 100644 GIT binary patch delta 15 XcmaFLvWI1Y3M11*)u@dt_A&whEA0h{ delta 54 zcmdnP@|0zQ3ZwQ!)hM+PUFV|I#FEVXJYAQ>l2j`NBLhP-T>~I8QZO{JGBVdTFfuUM ISaX080Kb9{X#fBK diff --git a/locales/zh_CN.mo b/locales/zh_CN.mo index 084bf211baf56fc4733637c943ac209b40474921..02100e43d90e15e78c5a1f1d3b9d9ad0baa6aecd 100644 GIT binary patch delta 215 zcmaFNzl(pullp0l3=H-x3=HxN3=G#;85o3t^fw?a38cB$Abb@dtpwy-0BMkTG?118 z(xp)O2|yZ%7?uDD9w5CM%HIK`g@FA1Ksp#mUjow1Kw6C*qE3sQ!40gy94H_Pl<)%5 tTtGSjsvsLmR{&{Fpm-~g76a1#K$;&&F9Xsb1GjBn$#{op^Ewt&W&pN+7P9~V delta 254 zcmdnR|CoQmlluLP3=H-x3=HxN3=IES85o3tv^*OFgCvkP2GStDFOXIO(uq*<79cGJ zr4j|1Bq|XCskb(C%uVlQ#q!yyylWK fYNcRgU}&jpV5Dnks$ghfWoWK#00f(xSS*+UW<4Wm diff --git a/locales/zh_CN.po b/locales/zh_CN.po index fd45259b..ba7072ce 100644 --- a/locales/zh_CN.po +++ b/locales/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-15 10:17+0000\n" +"POT-Creation-Date: 2019-11-12 10:01+0000\n" "PO-Revision-Date: 2018-07-07 04:52+0000\n" "Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/zh_CN/)\n" @@ -23,7 +23,7 @@ msgstr "" #: front/preference.form.php:45 front/config.php:45 inc/profile.class.php:38 #: inc/notification.class.php:18 inc/common.class.php:49 #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 -#: setup.php:168 test.php:4 +#: setup.php:174 test.php:4 msgid "More Reporting" msgstr "更多报表" From 161dba1669c7086581bcd507a56e8c780bfc71fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Thu, 14 Nov 2019 10:47:28 +0100 Subject: [PATCH 4/9] Whitelist autocomplete fields --- inc/config.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inc/config.class.php b/inc/config.class.php index 32421ce0..f3c8cf31 100644 --- a/inc/config.class.php +++ b/inc/config.class.php @@ -117,6 +117,7 @@ function rawSearchOptions() { 'table' => $this->getTable(), 'field' => 'unit', 'name' => __('Unit', 'mreporting'), + 'autocomplete' => true, ]; $tab[] = [ @@ -124,6 +125,7 @@ function rawSearchOptions() { 'table' => $this->getTable(), 'field' => 'default_delay', 'name' => __('Default delay', 'mreporting'), + 'autocomplete' => true, ]; $tab[] = [ @@ -131,6 +133,7 @@ function rawSearchOptions() { 'table' => $this->getTable(), 'field' => 'condition', 'name' => __('Additional condition for MySQL', 'mreporting'), + 'autocomplete' => true, ]; $tab[] = [ From 696bd2417d0c4fa596ee5b3f6c8648d38e6d0477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 7 Feb 2020 15:10:52 +0100 Subject: [PATCH 5/9] Update Travis configuration - Add PHP 7.4 in matrix. - Limit matrix to lowest and highiest PHP supported version. - Run CS checks in strict mode. - Remove dead config lines. --- .travis.yml | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index 972e75da..b389e063 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,51 +1,20 @@ language: php php: - 5.6 - - 7.0 - - 7.1 - - 7.2 + - 7.4 - nightly -#env: -# global: -# - DB=mysql -# matrix: -# - GLPIVER=9.1/bugfixes -# - GLPIVER=master - 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 ../{LNAME} plugins/{LNAME} -# - cd plugins/{LNAME} - - 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/ - + - vendor/bin/robo --no-interaction code:cs --strict matrix: -# exclude: -# - php: 5.4 -# env: GLPIVER=master allow_failures: - php: nightly cache: directories: - $HOME/.composer/cache - -#notifications: -# irc: -# channels: -# - "irc.freenode.org#channel" -# on_success: change -# on_failure: always -# use_notice: true -# skip_join: true From e3ca4aa7ea6301cad1da944734449d9605e035f8 Mon Sep 17 00:00:00 2001 From: milotype <43657314+milotype@users.noreply.github.com> Date: Wed, 12 Feb 2020 18:10:19 +0100 Subject: [PATCH 6/9] Added files for reports_locales hr_HR complete croatian translation --- locales/reports_locales/helpdesk_hr_HR.php | 114 +++++++++++++++++ .../reports_locales/helpdeskplus_hr_HR.php | 111 ++++++++++++++++ locales/reports_locales/inventory_hr_HR.php | 121 ++++++++++++++++++ locales/reports_locales/other_hr_HR.php | 12 ++ locales/reports_locales/tag_hr_HR.php | 20 +++ 5 files changed, 378 insertions(+) create mode 100644 locales/reports_locales/helpdesk_hr_HR.php create mode 100644 locales/reports_locales/helpdeskplus_hr_HR.php create mode 100644 locales/reports_locales/inventory_hr_HR.php create mode 100644 locales/reports_locales/other_hr_HR.php create mode 100644 locales/reports_locales/tag_hr_HR.php diff --git a/locales/reports_locales/helpdesk_hr_HR.php b/locales/reports_locales/helpdesk_hr_HR.php new file mode 100644 index 00000000..b453526e --- /dev/null +++ b/locales/reports_locales/helpdesk_hr_HR.php @@ -0,0 +1,114 @@ + "Podrška", + + 'reportHbarTicketNumberByEntity' => [ + 'title' => "Broj naloga po entitetu", + 'desc' => "Stupci", + 'category' => "Po entitetu", + ], + + 'reportPieTicketNumberByEntity' => [ + 'title' => "Broj naloga po entitetu", + 'desc' => "Torta", + 'category' => "Po entitetu", + ], + + 'reportHgbarTicketNumberByCatAndEntity' => [ + 'title' => "Broj naloga po kategoriji i entitetu", + 'desc' => "Grupirani stupci", + 'category' => "Po entitetu", + ], + + 'reportPieTopTenAuthor' => [ + 'title' => "Top 10 podnositelja", + 'desc' => "Torta", + 'category' => "Po podnositelju", + ], + + 'reportHgbarOpenTicketNumberByCategoryAndByType' => [ + 'title' => "Broj otvorenih naloga po kategoriji i vrsti", + 'desc' => "Grupirani stupci", + 'category' => "Po kategoriji", + ], + + 'reportHgbarCloseTicketNumberByCategoryAndByType' => [ + 'title' => "Broj zatvorenih naloga po kategoriji i vrsti", + 'desc' => "Grupirani stupci", + 'category' => "Po kategoriji", + ], + + 'reportHgbarOpenedTicketNumberByCategory' => [ + 'title' => "Broj otvorenih naloga po kategoriji i stanju", + 'desc' => "Grupirani stupci", + 'category' => "Po kategoriji", + ], + + 'reportHgbarTicketNumberByService' => [ + 'title' => "Broj otvorenih i zatvorenih naloga po usluzi", + 'desc' => "Grupirani stupci", + 'category' => "Po usluzi", + ], + + 'reportPieTicketOpenedAndClosed' => [ + 'title' => "Broj otvorenih i zatvorenih naloga", + 'desc' => "Torta", + 'category' => "Po nalogu", + ], + + 'reportPieTicketOpenedbyStatus' => [ + 'title' => "Broj otvorenih naloga po stanju", + 'desc' => "Torta", + 'category' => "Po nalogu", + ], + + 'reportAreaNbTicket' => [ + 'title' => "Razvoj broja naloga u razdoblju", + 'desc' => "Područje", + 'category' => "Po nalogu", + ], + + 'reportLineNbTicket' => [ + 'title' => "Razvoj broja naloga u razdoblju", + 'desc' => "Linija", + 'category' => "Po nalogu", + ], + + 'reportGlineNbTicket' => [ + 'title' => "Razvoj broja naloga u razdoblju (po stanju)", + 'desc' => "Linija", + 'category' => "Po nalogu", + ], + + 'reportGareaNbTicket' => [ + 'title' => "Razvoj broja naloga u razdoblju (po stanju)", + 'desc' => "Područje", + 'category' => "Po nalogu", + ], + + 'reportVstackbarNbTicket' => [ + 'title' => "Razvoj broja naloga u razdoblju (po stanju)", + 'desc' => "Složeni stupci", + 'category' => "Po nalogu", + ], + + 'reportSunburstTicketByCategories' => [ + 'title' => "Podjela naloga po kategoriji i podkategorijama", + 'desc' => "Prsten", + 'category' => "Po kategoriji", + ], + + 'reportVstackbarTicketStatusByTechnician' => [ + 'title' => "Broj naloga po stanju i tehničaru", + 'desc' => "Složeni stupci", + 'category' => "Po nalogu", + ], + + 'reportHbarTicketNumberByLocation' => [ + 'title' => "Broj naloga po lokaciji podnositelja", + 'desc' => "Stupci", + 'category' => "Po podnositelju", + ], +]; \ No newline at end of file diff --git a/locales/reports_locales/helpdeskplus_hr_HR.php b/locales/reports_locales/helpdeskplus_hr_HR.php new file mode 100644 index 00000000..f87ba708 --- /dev/null +++ b/locales/reports_locales/helpdeskplus_hr_HR.php @@ -0,0 +1,111 @@ + 'Proširena podrška', + + // MISC LOCALES + 'backlogs' => "Zaostaci", + 'opened' => "Otvoreni", + 'period' => "Razdoblje", + 'backlogstatus' => "Stanje za prikaz", + 'slaobserved' => "UGOVOR O RAZINI USLUGE promatrano", + 'slanotobserved'=> "UGOVOR O RAZINI USLUGE nepromatrano", + 'observed' => "promatrano", + 'notobserved' => "nepromatrano", + + + // SELECTOR + 'selector' => [ + 'slas' => "UGOVORI O RAZINI USLUGE", + 'categories' => "Kategorija", + ], + + + // GENERAL REPORTS + 'reportGlineBacklogs' => [ + 'title' => "Zaostaci", + 'desc' => "", + 'category' => "Opće", + ], + + 'reportVstackbarLifetime' => [ + 'title' => "Starost naloga", + 'desc' => "", + 'category' => "Opće", + ], + + 'reportVstackbarTicketsgroups' => [ + 'title' => "Nalozi po grupi", + 'desc' => "", + 'category' => "Opće", + ], + + 'reportVstackbarTicketstech' => [ + 'title' => "Nalozi po tehničaru", + 'desc' => "", + 'category' => "Opće", + ], + + 'reportVstackbarWorkflow' => [ + 'title' => "Smjer redova čekanja", + 'desc' => "", + 'category' => "Opće", + ], + + 'reportHbarTopcategory' => [ + 'title' => "TOP kategorije", + 'desc' => "", + 'category' => "Opće", + ], + + 'reportHbarTopapplicant' => [ + 'title' => "TOP grupe podnositelja", + 'desc' => "", + 'category' => "Opće", + ], + + 'reportVstackbarGroupChange' => [ + 'title' => "Broj promjena grupe", + 'desc' => "", + 'category' => "Opće", + ], + + 'reportLineActiontimeVsSolvedelay' => [ + 'title' => "Usporedba vremena zadatka i vremena rješavanja", + 'desc' => "", + 'category' => "Opće", + ], + + + // SLA REPORTS + 'reportVstackbarNbTicketBySla' => [ + 'title' => "Broj naloga po ugovoru o razini usluge", + 'desc' => "", + 'category' => "Po ugovoru o razini usluge", + ], + + 'reportGlineNbTicketBySla' => [ + 'title' => "Razvoj naloga po ugovoru o razini usluge", + 'desc' => "", + 'category' => "Po ugovoru o razini usluge", + ], + + 'reportHgbarRespectedSlasByTopCategory' => [ + 'title' => "Nalozi po ugovoru o razini usluge, razvrstani po kategorijama", + 'desc' => "", + 'category' => "Po ugovoru o razini usluge", + ], + + 'reportHgbarRespectedSlasByTechnician' => [ + 'title' => "Nalozi po ugovoru o razini usluge, razvrstani po tehničarima", + 'desc' => "", + 'category' => "Po ugovoru o razini usluge", + ], + + 'reportVstackbarRespectedSlasByGroup' => [ + 'title' => "Nalozi po ugovoru o razini usluge, razvrstani po grupama", + 'desc' => "", + 'category' => "Po ugovoru o razini usluge", + ], +]; \ No newline at end of file diff --git a/locales/reports_locales/inventory_hr_HR.php b/locales/reports_locales/inventory_hr_HR.php new file mode 100644 index 00000000..133dddbb --- /dev/null +++ b/locales/reports_locales/inventory_hr_HR.php @@ -0,0 +1,121 @@ + "Inventar", + + 'reportHbarComputersByOS' => [ + 'title' => "Računala po OS-u", + 'desc' => "Stupci", + 'category' => "OS", + ], + + 'reportPieComputersByOS' => [ + 'title' => "Računala po OS-u", + 'desc' => "Torta", + 'category' => "OS", + ], + + 'reportHbarComputersByFabricant' => [ + 'title' => "Računala po proizvođaču", + 'desc' => "Stupci", + 'category' => "Proizvođač", + ], + + 'reportPieComputersByFabricant' => [ + 'title' => "Računala po proizvođaču", + 'desc' => "Torta", + 'category' => "Proizvođač", + ], + + 'reportHbarComputersByType' => [ + 'title' => "Računala po vrsti", + 'desc' => "Stupci", + 'category' => "Vrsta", + ], + + 'reportPieComputersByType' => [ + 'title' => "Računala po vrsti", + 'desc' => "Torta", + 'category' => "Vrsta", + ], + + 'reportHbarComputersByStatus' => [ + 'title' => "Računala po stanju", + 'desc' => "Stupci", + 'category' => "Stanje", + ], + + 'reportHbarPrintersByStatus' => [ + 'title' => "Pisači po stanju", + 'desc' => "Stupci", + 'category' => "Stanje", + ], + + 'reportHbarWindows' => [ + 'title' => "Windows verzije", + 'desc' => "Stupci", + 'category' => "OS", + ], + + 'reportHbarLinux' => [ + 'title' => "Linux verzije", + 'desc' => "Stupci", + 'category' => "OS", + ], + + 'reportHbarLinuxDistro' => [ + 'title' => "Linux distribucije", + 'desc' => "Stupci", + 'category' => "OS", + ], + + 'reportHbarMac' => [ + 'title' => "Mac OS X verzije", + 'desc' => "Stupci", + 'category' => "OS", + ], + + 'reportHbarMacFamily' => [ + 'title' => "MAC OS X verzije, pregled", + 'desc' => "Stupci", + 'category' => "OS", + ], + + 'reportHbarComputersByAge' => [ + 'title' => "Računala po starosti", + 'desc' => "Stupci", + 'category' => "Inventar", + ], + + 'reportPieComputersByAge' => [ + 'title' => "Računala po starosti", + 'desc' => "Torta", + 'category' => "Inventar", + ], + + 'reportHbarFusionInventory' => [ + 'title' => "FusionInventory agenti", + 'desc' => "Stupci", + 'category' => "Agent", + ], + + 'reportPieFusionInventory' => [ + 'title' => "FusionInventory agenti", + 'desc' => "Torta", + 'category' => "Agent", + ], + + 'reportHbarMonitors' => [ + 'title' => "Ekrani po računalu", + 'desc' => "Stupci", + 'category' => "Inventar", + ], + + 'reportHbarComputersByEntity' => [ + 'title' => "Računala po entitetu", + 'desc' => "Stupci", + 'category' => "Entitet", + ], +]; diff --git a/locales/reports_locales/other_hr_HR.php b/locales/reports_locales/other_hr_HR.php new file mode 100644 index 00000000..56dca95b --- /dev/null +++ b/locales/reports_locales/other_hr_HR.php @@ -0,0 +1,12 @@ + "Ostalo", + + 'reportHbarLogs' => [ + 'title' => "Log-zapisi", + 'desc' => "Stupci", + 'category' => "Log-zapisi", + ] +]; \ No newline at end of file diff --git a/locales/reports_locales/tag_hr_HR.php b/locales/reports_locales/tag_hr_HR.php new file mode 100644 index 00000000..a44b7a7c --- /dev/null +++ b/locales/reports_locales/tag_hr_HR.php @@ -0,0 +1,20 @@ + "Dodatak „Oznake”", + + 'reportPieTag' => [ + 'title' => "Broj korištenih oznaka", + 'desc' => "Torta", + 'category' => "Za sve GLPI objekte", + ], + + 'reportPieTagOnTicket' => [ + 'title' => "Broj korištenih oznaka", + 'desc' => "Torta", + 'category' => "Za naloge", + ] + +]; \ No newline at end of file From a8be88d6349208e7a9411b93bd3833131d8dba7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Thu, 14 Nov 2019 15:55:49 +0100 Subject: [PATCH 7/9] Add GLPI 9.5 compatibility * Replace usage of deprecated 'getAllDatasFromTable()' * Replace usage of deprecated 'DBMysql::fetch_assoc()' * Use TIMESTAMP instead of DATETIME in DB for new installations * Fix 'Declaration of PluginMreportingCommon::getIcon() should be compatible with CommonDBTM::getIcon()' * Add marketplace compatibility * Fix curly braces deprecated usage * Add menu icon * Use GLPI 9.5 min required PHP version * Add 1.7.0 version definition --- .travis.yml | 7 +- ajax/dashboard.php | 5 +- ajax/homepage_link.php | 4 +- composer.json | 13 +- composer.lock | 827 +++++++++++++++++++++----------- front/central.php | 4 +- hook.php | 6 +- inc/common.class.php | 28 +- inc/config.class.php | 8 +- inc/dashboard.class.php | 8 +- inc/graph.class.php | 2 +- inc/graphpng.class.php | 20 +- inc/helpdesk.class.php | 30 +- inc/helpdeskplus.class.php | 26 +- inc/inventory.class.php | 18 +- inc/notificationevent.class.php | 2 +- inc/preference.class.php | 2 +- inc/profile.class.php | 4 +- inc/tag.class.php | 4 +- js/helpdesk-menu.js | 7 +- mreporting.xml | 4 +- setup.php | 65 +-- 22 files changed, 652 insertions(+), 442 deletions(-) diff --git a/.travis.yml b/.travis.yml index b389e063..17203bb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: php php: - - 5.6 + - 7.2 - 7.4 - - nightly before_script: - composer self-update @@ -11,10 +10,6 @@ before_script: script: - vendor/bin/robo --no-interaction code:cs --strict -matrix: - allow_failures: - - php: nightly - cache: directories: - $HOME/.composer/cache diff --git a/ajax/dashboard.php b/ajax/dashboard.php index d658f26d..8e3e535c 100644 --- a/ajax/dashboard.php +++ b/ajax/dashboard.php @@ -26,8 +26,9 @@ //load protovis lib for dashboard render $version = Plugin::getInfo('mreporting', 'version'); - echo Html::script("/plugins/mreporting/lib/protovis/protovis.min.js", ['version' => $version]); - echo Html::script("/plugins/mreporting/lib/protovis-msie/protovis-msie.min.js", ['version' => $version]); + $php_dir = Plugin::getPhpDir('mreporting', false); + echo Html::script($php_dir . "/lib/protovis/protovis.min.js", ['version' => $version]); + echo Html::script($php_dir . "/lib/protovis-msie/protovis-msie.min.js", ['version' => $version]); Html::popFooter(); break; diff --git a/ajax/homepage_link.php b/ajax/homepage_link.php index 61149f66..dbef8689 100644 --- a/ajax/homepage_link.php +++ b/ajax/homepage_link.php @@ -3,6 +3,6 @@ Session::checkLoginUser(); -echo ''; diff --git a/composer.json b/composer.json index 79779f9e..92fc1bb6 100644 --- a/composer.json +++ b/composer.json @@ -1,14 +1,17 @@ { - "require-dev": { - "glpi-project/tools": "^0.1" - }, "require": { + "php": "^7.2", "masnathan/odtphp": "dev-teclib" }, + "require-dev": { + "glpi-project/tools": "^0.1" + }, "config": { + "optimize-autoloader": true, "platform": { - "php": "5.6" - } + "php": "7.2.0" + }, + "sort-packages": true }, "repositories": [ { diff --git a/composer.lock b/composer.lock index da728cca..be24f61d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "49d66d688979ebbe1b75d312baa18d53", + "content-hash": "a91291239eda8ca133325a08094c24aa", "packages": [ { "name": "masnathan/odtphp", @@ -68,31 +68,31 @@ "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.12.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "512a2e54c98f3af377589de76c43b24652bcb789" + "reference": "efc58dc0f34a45539787c5190b41b5d2a50a08da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789", - "reference": "512a2e54c98f3af377589de76c43b24652bcb789", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/efc58dc0f34a45539787c5190b41b5d2a50a08da", + "reference": "efc58dc0f34a45539787c5190b41b5d2a50a08da", "shasum": "" }, "require": { - "consolidation/output-formatters": "^3.4", - "php": ">=5.4.5", - "psr/log": "^1", - "symfony/console": "^2.8|^3|^4", - "symfony/event-dispatcher": "^2.5|^3|^4", - "symfony/finder": "^2.5|^3|^4" + "consolidation/output-formatters": "^4.1.1", + "php": ">=7.1.3", + "psr/log": "^1|^2", + "symfony/console": "^4.4.8|^5", + "symfony/event-dispatcher": "^4.4.8|^5", + "symfony/finder": "^4.4.8|^5" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", + "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^6", - "squizlabs/php_codesniffer": "^2.7" + "squizlabs/php_codesniffer": "^3" }, "type": "library", "extra": { @@ -106,42 +106,10 @@ "php": "7.1.3" } } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - }, - "scenario-options": { - "create-lockfile": "false" - } - }, - "phpunit4": { - "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - } } }, "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -160,7 +128,7 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2019-03-08T16:55:03+00:00" + "time": "2020-05-27T21:11:36+00:00" }, { "name": "consolidation/config", @@ -245,74 +213,45 @@ }, { "name": "consolidation/log", - "version": "1.1.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a" + "reference": "ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", - "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", + "url": "https://api.github.com/repos/consolidation/log/zipball/ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf", + "reference": "ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf", "shasum": "" }, "require": { - "php": ">=5.4.5", + "php": ">=7.1.3", "psr/log": "^1.0", - "symfony/console": "^2.8|^3|^4" + "symfony/console": "^4|^5" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", + "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^6", - "squizlabs/php_codesniffer": "^2" + "squizlabs/php_codesniffer": "^3" }, "type": "library", "extra": { "scenarios": { "symfony4": { - "require": { - "symfony/console": "^4.0" - }, - "config": { - "platform": { - "php": "7.1.3" - } - } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - } - }, - "phpunit4": { - "require-dev": { - "phpunit/phpunit": "^4.8.36" + "symfony/console": "^4" }, - "remove": [ - "php-coveralls/php-coveralls" - ], "config": { "platform": { - "php": "5.4.8" + "php": "7.1.3" } } } }, "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -331,35 +270,35 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2019-01-01T17:30:51+00:00" + "time": "2020-05-27T17:06:13+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.5.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "99ec998ffb697e0eada5aacf81feebfb13023605" + "reference": "9deeddd6a916d0a756b216a8b40ce1016e17c0b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605", - "reference": "99ec998ffb697e0eada5aacf81feebfb13023605", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/9deeddd6a916d0a756b216a8b40ce1016e17c0b9", + "reference": "9deeddd6a916d0a756b216a8b40ce1016e17c0b9", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0", - "php": ">=5.4.0", - "symfony/console": "^2.8|^3|^4", - "symfony/finder": "^2.5|^3|^4" + "php": ">=7.1.3", + "symfony/console": "^4|^5", + "symfony/finder": "^4|^5" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", - "phpunit/phpunit": "^5.7.27", - "squizlabs/php_codesniffer": "^2.7", - "symfony/var-dumper": "^2.8|^3|^4", - "victorjonsson/markdowndocs": "^1.3" + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^6", + "squizlabs/php_codesniffer": "^3", + "symfony/var-dumper": "^4", + "symfony/yaml": "^4" }, "suggest": { "symfony/var-dumper": "For using the var_dump formatter" @@ -371,49 +310,15 @@ "require": { "symfony/console": "^4.0" }, - "require-dev": { - "phpunit/phpunit": "^6" - }, "config": { "platform": { "php": "7.1.3" } } - }, - "symfony3": { - "require": { - "symfony/console": "^3.4", - "symfony/finder": "^3.4", - "symfony/var-dumper": "^3.4" - }, - "config": { - "platform": { - "php": "5.6.32" - } - } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - }, - "scenario-options": { - "create-lockfile": "false" - } } }, "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -432,30 +337,30 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2019-05-30T23:16:01+00:00" + "time": "2020-05-27T20:51:17+00:00" }, { "name": "consolidation/robo", - "version": "1.4.11", + "version": "1.4.12", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "5fa1d901776a628167a325baa9db95d8edf13a80" + "reference": "eb45606f498b3426b9a98b7c85e300666a968e51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/5fa1d901776a628167a325baa9db95d8edf13a80", - "reference": "5fa1d901776a628167a325baa9db95d8edf13a80", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/eb45606f498b3426b9a98b7c85e300666a968e51", + "reference": "eb45606f498b3426b9a98b7c85e300666a968e51", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.11.0", - "consolidation/config": "^1.2", - "consolidation/log": "~1", - "consolidation/output-formatters": "^3.1.13", - "consolidation/self-update": "^1", - "grasmash/yaml-expander": "^1.3", - "league/container": "^2.2", + "consolidation/annotated-command": "^2.11.0|^4.1", + "consolidation/config": "^1.2.1", + "consolidation/log": "^1.1.1|^2", + "consolidation/output-formatters": "^3.1.13|^4.1", + "consolidation/self-update": "^1.1.5", + "grasmash/yaml-expander": "^1.4", + "league/container": "^2.4.1", "php": ">=5.5.0", "symfony/console": "^2.8|^3|^4", "symfony/event-dispatcher": "^2.5|^3|^4", @@ -467,20 +372,13 @@ "codegyre/robo": "< 1.0" }, "require-dev": { - "codeception/aspect-mock": "^1|^2.1.1", - "codeception/base": "^2.3.7", - "codeception/verify": "^0.3.2", "g1a/composer-test-scenarios": "^3", - "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", + "patchwork/jsqueeze": "^2", "pear/archive_tar": "^1.4.4", "php-coveralls/php-coveralls": "^1", - "phpunit/php-code-coverage": "~2|~4", - "sebastian/comparator": "^1.2.4", - "squizlabs/php_codesniffer": "^2.8" + "phpunit/phpunit": "^5.7.27", + "squizlabs/php_codesniffer": "^3" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", @@ -508,8 +406,11 @@ "require": { "symfony/console": "^2.8" }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, "remove": [ - "goaop/framework" + "php-coveralls/php-coveralls" ], "config": { "platform": { @@ -522,7 +423,7 @@ } }, "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -541,26 +442,26 @@ } ], "description": "Modern task runner", - "time": "2019-10-29T15:50:02+00:00" + "time": "2020-02-18T17:31:26+00:00" }, { "name": "consolidation/self-update", - "version": "1.1.5", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/consolidation/self-update.git", - "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54" + "reference": "dba6b2c0708f20fa3ba8008a2353b637578849b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54", - "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54", + "url": "https://api.github.com/repos/consolidation/self-update/zipball/dba6b2c0708f20fa3ba8008a2353b637578849b4", + "reference": "dba6b2c0708f20fa3ba8008a2353b637578849b4", "shasum": "" }, "require": { "php": ">=5.5.0", - "symfony/console": "^2.8|^3|^4", - "symfony/filesystem": "^2.5|^3|^4" + "symfony/console": "^2.8|^3|^4|^5", + "symfony/filesystem": "^2.5|^3|^4|^5" }, "bin": [ "scripts/release" @@ -581,17 +482,17 @@ "MIT" ], "authors": [ - { - "name": "Greg Anderson", - "email": "greg.1.anderson@greenknowe.org" - }, { "name": "Alexander Menk", "email": "menk@mestrona.net" + }, + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" } ], "description": "Provides a self:update command for Symfony Console applications.", - "time": "2018-10-28T01:52:03+00:00" + "time": "2020-04-13T02:49:20+00:00" }, { "name": "container-interop/container-interop", @@ -622,6 +523,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", + "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, { @@ -722,16 +624,16 @@ }, { "name": "glpi-project/tools", - "version": "0.1.8", + "version": "0.1.13", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897" + "reference": "2028ecf9acd8b838cff37771dcab77ced9391f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/39ca503a00454e6c5d7d97bd8baff358d262a897", - "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/2028ecf9acd8b838cff37771dcab77ced9391f41", + "reference": "2028ecf9acd8b838cff37771dcab77ced9391f41", "shasum": "" }, "require": { @@ -768,7 +670,7 @@ "plugins", "tools" ], - "time": "2019-06-07T09:46:17+00:00" + "time": "2020-06-19T10:29:26+00:00" }, { "name": "grasmash/expander", @@ -1070,16 +972,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -1113,20 +1015,20 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.2", + "version": "3.5.5", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7" + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", - "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", "shasum": "" }, "require": { @@ -1164,29 +1066,33 @@ "phpcs", "standards" ], - "time": "2019-10-28T04:36:32+00:00" + "time": "2020-04-17T01:09:41+00:00" }, { "name": "symfony/console", - "version": "v3.4.33", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c7edffb26b29cae972ca4afccb610a38ce8d0ccf" + "reference": "326b064d804043005526f5a0494cfb49edb59bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c7edffb26b29cae972ca4afccb610a38ce8d0ccf", - "reference": "c7edffb26b29cae972ca4afccb610a38ce8d0ccf", + "url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0", + "reference": "326b064d804043005526f5a0494cfb49edb59bb0", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php80": "^1.15", + "symfony/service-contracts": "^1.1|^2" }, "conflict": { "symfony/dependency-injection": "<3.4", + "symfony/event-dispatcher": "<4.3|>=5", + "symfony/lock": "<4.4", "symfony/process": "<3.3" }, "provide": { @@ -1194,11 +1100,12 @@ }, "require-dev": { "psr/log": "~1.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" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/event-dispatcher": "^4.3", + "symfony/lock": "^4.4|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/var-dumper": "^4.3|^5.0" }, "suggest": { "psr/log": "For using the console logger", @@ -1209,7 +1116,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1236,41 +1143,69 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T20:06:45+00:00" }, { - "name": "symfony/debug", - "version": "v3.4.33", + "name": "symfony/event-dispatcher", + "version": "v4.4.10", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/f72e33fdb1170b326e72c3157f0cd456351dd086", - "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866", + "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0" + "php": ">=7.1.3", + "symfony/event-dispatcher-contracts": "^1.1" }, "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + "symfony/dependency-injection": "<3.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "1.1" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0" + "psr/log": "~1.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/stopwatch": "^3.4|^4.0|^5.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\Debug\\": "" + "Symfony\\Component\\EventDispatcher\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -1290,54 +1225,55 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T08:37:50+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v3.4.33", + "name": "symfony/event-dispatcher-contracts", + "version": "v1.1.7", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177" + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f9031c22ec127d4a2450760f81a8677fe8a10177", - "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18", + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18", "shasum": "" }, "require": { - "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|~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" + "php": "^7.1.3" }, "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "psr/event-dispatcher": "", + "symfony/event-dispatcher-implementation": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "1.1-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Symfony\\Contracts\\EventDispatcher\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1345,40 +1281,48 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Generic abstractions related to dispatching event", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-09-17T09:54:03+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.33", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516" + "reference": "b27f491309db5757816db672b256ea2e03677d30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516", - "reference": "00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b27f491309db5757816db672b256ea2e03677d30", + "reference": "b27f491309db5757816db672b256ea2e03677d30", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1405,29 +1349,43 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-08-20T13:31:17+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T18:50:54+00:00" }, { "name": "symfony/finder", - "version": "v3.4.33", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3e915e5ce305f8bc8017597f71f1f4095092ddf8" + "reference": "5729f943f9854c5781984ed4907bbb817735776b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3e915e5ce305f8bc8017597f71f1f4095092ddf8", - "reference": "3e915e5ce305f8bc8017597f71f1f4095092ddf8", + "url": "https://api.github.com/repos/symfony/finder/zipball/5729f943f9854c5781984ed4907bbb817735776b", + "reference": "5729f943f9854c5781984ed4907bbb817735776b", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1454,20 +1412,34 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-10-30T12:43:22+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-03-27T16:54:36+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.12.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4" + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", "shasum": "" }, "require": { @@ -1479,7 +1451,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1512,20 +1488,34 @@ "polyfill", "portable" ], - "time": "2019-08-06T08:03:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + "reference": "7110338d81ce1cbc3e273136e4574663627037a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7", + "reference": "7110338d81ce1cbc3e273136e4574663627037a7", "shasum": "" }, "require": { @@ -1537,7 +1527,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1571,29 +1565,199 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" + }, + { + "name": "symfony/polyfill-php73", + "version": "v1.17.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a", + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.17.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "shasum": "" + }, + "require": { + "php": ">=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/process", - "version": "v3.4.33", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e" + "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e", - "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e", + "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5", + "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1620,31 +1784,103 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T20:06:45+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v1.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/container": "^1.0" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-10-14T12:27:06+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.33", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "dab657db15207879217fc81df4f875947bf68804" + "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/dab657db15207879217fc81df4f875947bf68804", - "reference": "dab657db15207879217fc81df4f875947bf68804", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", + "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -1652,7 +1888,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1679,7 +1915,21 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T08:37:50+00:00" } ], "aliases": [], @@ -1689,9 +1939,12 @@ }, "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": "^7.2" + }, "platform-dev": [], "platform-overrides": { - "php": "5.6" - } + "php": "7.2.0" + }, + "plugin-api-version": "1.1.0" } diff --git a/front/central.php b/front/central.php index 832c10fb..6a5a22ed 100644 --- a/front/central.php +++ b/front/central.php @@ -39,8 +39,8 @@ foreach ($reports as $classname => $report) { $tabs[$classname]=['title'=>$report['title'], - 'url'=>$CFG_GLPI['root_doc']."/plugins/mreporting/ajax/common.tabs.php", - 'params'=>"target=".$_SERVER['PHP_SELF']."&classname=$classname"]; + 'url'=>Plugin::getWebDir('mreporting')."/ajax/common.tabs.php", + 'params'=>"target=".$_SERVER['PHP_SELF']."&classname=$classname"]; } if (count($tabs) > 0) { diff --git a/hook.php b/hook.php index d6e5524d..187cdc61 100644 --- a/hook.php +++ b/hook.php @@ -38,7 +38,7 @@ function plugin_mreporting_install() { $version = plugin_version_mreporting(); $migration = new Migration($version['version']); - include_once(GLPI_ROOT."/plugins/mreporting/inc/profile.class.php"); + include_once(Plugin::getPhpDir('mreporting')."/inc/profile.class.php"); //create profiles table $queries = []; @@ -118,7 +118,7 @@ function plugin_mreporting_install() { `notice`INT(11) NOT NULL DEFAULT 0, `alert` INT(11) NOT NULL DEFAULT 0, `comment` text collate utf8_unicode_ci, - `date_mod` datetime default NULL, + `date_mod` timestamp NULL default NULL, `is_deleted` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; @@ -275,7 +275,7 @@ function plugin_mreporting_giveItem($type, $ID, $data, $num) { $short_classname = ''; $f_name = ''; - $inc_dir = GLPI_ROOT."/plugins/mreporting/inc"; + $inc_dir = Plugin::getPhpDir('mreporting')."/inc"; //parse inc dir to search report classes $classes = PluginMreportingCommon::parseAllClasses($inc_dir); diff --git a/inc/common.class.php b/inc/common.class.php index 75b21915..66e560e2 100644 --- a/inc/common.class.php +++ b/inc/common.class.php @@ -56,18 +56,22 @@ public static function canCreate() { static function getMenuContent() { global $CFG_GLPI; - $img_db = "".__("Dashboard", "; - $img_ct = "".__("Reports list", "; - $url_central = "/plugins/mreporting/front/central.php"; - $url_dashboard = "/plugins/mreporting/front/dashboard.php"; + + $web_rel_dir = Plugin::getWebDir('mreporting', false); + $url_central = "/$web_rel_dir/front/central.php"; + $url_dashboard = "/$web_rel_dir/front/dashboard.php"; $menu = parent::getMenuContent(); $menu['page'] = PluginMreportingDashboard::CurrentUserHaveDashboard() ? $url_dashboard : $url_central; + $menu['icon'] = self::getIcon(); $menu['options']['dashboard']['page'] = $url_dashboard; $menu['options']['dashboard']['title'] = __("Dashboard", 'mreporting'); @@ -127,7 +131,7 @@ function getAllReports($with_url = true, $params = []) { $reports = []; - $inc_dir = GLPI_ROOT."/plugins/mreporting/inc"; + $inc_dir = Plugin::getPhpDir('mreporting') . "/inc"; $pics_dir = "../pics"; if (isset($params['classname']) @@ -292,7 +296,7 @@ function ($a, $b) { if ($setIdInOptionsValues) { $option_value = $value['id']; } - $icon = self::getIcon($value['function']); + $icon = self::getReportIcon($value['function']); $select .= "