From 7dd516756b533ac9603f8597cba70a0341ee504b Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 11 Oct 2017 12:01:40 +0200 Subject: [PATCH] - Removed .gitmodules - Removed directory submodules and content - Removed wikimedia from composer - Updated composer.json and composer.lock --- .gitmodules | 6 -- composer.json | 1 - composer.lock | 202 ++++++++++++++++-------------------------- submodules/bootstrap | 1 - submodules/pivottable | 1 - 5 files changed, 75 insertions(+), 136 deletions(-) delete mode 100644 .gitmodules delete mode 160000 submodules/bootstrap delete mode 160000 submodules/pivottable diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 41511b610..000000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "submodules/bootstrap"] - path = submodules/bootstrap - url = https://github.com/twbs/bootstrap.git -[submodule "submodules/pivottable"] - path = submodules/pivottable - url = https://github.com/nicolaskruchten/pivottable.git diff --git a/composer.json b/composer.json index 94c17e1d9..41e1b2077 100755 --- a/composer.json +++ b/composer.json @@ -196,7 +196,6 @@ "zetacomponents/workflow-database-tiein": "1.*", "zetacomponents/workflow-event-log-tiein": "1.*", "json-forms": "1.4.0", - "wikimedia/composer-merge-plugin": "^1.3", "fzaninotto/faker": "1.*", "netcarver/textile": "^3.5", "borgar/textile-js": "1.0", diff --git a/composer.lock b/composer.lock index 0da9a9b1f..8d83f68c6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "79a093497d04fa084ff4dece7cd1be4b", - "content-hash": "991e0fcfbc30ca3d04fd35eb36206c1e", + "hash": "d7b7c2de327697d4e0fb3bbb392b0a72", + "content-hash": "8759335901f4b67264f86b53ae54f18e", "packages": [ { "name": "alvaro-prieto/colResizable", @@ -20,16 +20,16 @@ }, { "name": "blueimp/jquery-file-upload", - "version": "v9.14.1", + "version": "v9.19.1", "source": { "type": "git", "url": "https://github.com/vkhramtsov/jQuery-File-Upload.git", - "reference": "71d67a9c277e29efcf5935cd2409009c0f841a57" + "reference": "88fabe7bb9bb99ee8be332546f953adf2ed9ed57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vkhramtsov/jQuery-File-Upload/zipball/71d67a9c277e29efcf5935cd2409009c0f841a57", - "reference": "71d67a9c277e29efcf5935cd2409009c0f841a57", + "url": "https://api.github.com/repos/vkhramtsov/jQuery-File-Upload/zipball/88fabe7bb9bb99ee8be332546f953adf2ed9ed57", + "reference": "88fabe7bb9bb99ee8be332546f953adf2ed9ed57", "shasum": "" }, "type": "library", @@ -66,7 +66,7 @@ "upload", "widget" ], - "time": "2016-11-21 05:38:19" + "time": "2017-09-05 05:45:32" }, { "name": "borgar/textile-js", @@ -109,23 +109,24 @@ }, { "name": "codeigniter/framework", - "version": "3.1.2", + "version": "3.1.6", "source": { "type": "git", "url": "https://github.com/bcit-ci/CodeIgniter.git", - "reference": "2afa6b6b58a73fa26a7a93045ccb1fc8a087a141" + "reference": "7e4f63cd4b792e7dc2dc4b8b0183a6072a3f9462" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/2afa6b6b58a73fa26a7a93045ccb1fc8a087a141", - "reference": "2afa6b6b58a73fa26a7a93045ccb1fc8a087a141", + "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/7e4f63cd4b792e7dc2dc4b8b0183a6072a3f9462", + "reference": "7e4f63cd4b792e7dc2dc4b8b0183a6072a3f9462", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": ">=5.3.7" }, "require-dev": { - "mikey179/vfsstream": "1.1.*" + "mikey179/vfsstream": "1.1.*", + "phpunit/phpunit": "4.* || 5.*" }, "suggest": { "paragonie/random_compat": "Provides better randomness in PHP 5.x" @@ -137,7 +138,7 @@ ], "description": "The CodeIgniter framework", "homepage": "https://codeigniter.com", - "time": "2016-10-28 15:13:14" + "time": "2017-09-25 16:43:58" }, { "name": "components/angular.js", @@ -848,29 +849,31 @@ }, { "name": "fzaninotto/faker", - "version": "v1.6.0", + "version": "v1.7.1", "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123" + "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123", - "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d", + "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d", "shasum": "" }, "require": { - "php": "^5.3.3|^7.0" + "php": "^5.3.3 || ^7.0" }, "require-dev": { "ext-intl": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" + "phpunit/phpunit": "^4.0 || ^5.0", + "squizlabs/php_codesniffer": "^1.5" }, "type": "library", "extra": { - "branch-alias": [] + "branch-alias": { + "dev-master": "1.8-dev" + } }, "autoload": { "psr-4": { @@ -892,7 +895,7 @@ "faker", "fixtures" ], - "time": "2016-04-29 12:21:54" + "time": "2017-08-15 16:48:10" }, { "name": "joeldbirch/superfish", @@ -1426,16 +1429,16 @@ }, { "name": "rdlowrey/auryn", - "version": "v1.4.0", + "version": "v1.4.2", "source": { "type": "git", "url": "https://github.com/rdlowrey/auryn.git", - "reference": "2e4240791162dfe073d59654d8dc06df0eb0b73f" + "reference": "8c4dc07943599ba84f4f89eab8cf43efeef80395" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rdlowrey/auryn/zipball/2e4240791162dfe073d59654d8dc06df0eb0b73f", - "reference": "2e4240791162dfe073d59654d8dc06df0eb0b73f", + "url": "https://api.github.com/repos/rdlowrey/auryn/zipball/8c4dc07943599ba84f4f89eab8cf43efeef80395", + "reference": "8c4dc07943599ba84f4f89eab8cf43efeef80395", "shasum": "" }, "require": { @@ -1483,7 +1486,7 @@ "dic", "ioc" ], - "time": "2016-03-14 20:10:19" + "time": "2017-05-15 06:26:46" }, { "name": "rmariuzzo/jquery-checkboxes", @@ -1895,21 +1898,21 @@ }, { "name": "symfony/console", - "version": "v2.8.14", + "version": "v2.8.28", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a871ba00e0f604dceac64c56c27f99fbeaf4854e" + "reference": "f81549d2c5fdee8d711c9ab3c7e7362353ea5853" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a871ba00e0f604dceac64c56c27f99fbeaf4854e", - "reference": "a871ba00e0f604dceac64c56c27f99fbeaf4854e", + "url": "https://api.github.com/repos/symfony/console/zipball/f81549d2c5fdee8d711c9ab3c7e7362353ea5853", + "reference": "f81549d2c5fdee8d711c9ab3c7e7362353ea5853", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/debug": "~2.7,>=2.7.2|~3.0.0", + "symfony/debug": "^2.7.2|~3.0.0", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { @@ -1952,7 +1955,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-11-15 23:02:12" + "time": "2017-10-01 21:00:16" }, { "name": "symfony/debug", @@ -2013,16 +2016,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.3.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" + "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", + "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", "shasum": "" }, "require": { @@ -2034,7 +2037,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -2068,20 +2071,20 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2017-06-14 15:44:48" }, { "name": "symfony/process", - "version": "v3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0" + "reference": "fdf89e57a723a29baf536e288d6e232c059697b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0", - "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0", + "url": "https://api.github.com/repos/symfony/process/zipball/fdf89e57a723a29baf536e288d6e232c059697b1", + "reference": "fdf89e57a723a29baf536e288d6e232c059697b1", "shasum": "" }, "require": { @@ -2117,20 +2120,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-07-29 21:54:42" + "time": "2017-10-02 06:42:24" }, { "name": "symfony/yaml", - "version": "v2.8.14", + "version": "v2.8.28", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff" + "reference": "842fb6df22180244b4c65935ce1a88d324e5ff9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff", - "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff", + "url": "https://api.github.com/repos/symfony/yaml/zipball/842fb6df22180244b4c65935ce1a88d324e5ff9e", + "reference": "842fb6df22180244b4c65935ce1a88d324e5ff9e", "shasum": "" }, "require": { @@ -2166,7 +2169,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-11-14 16:15:57" + "time": "2017-10-05 14:38:30" }, { "name": "tapmodo/Jcrop", @@ -2181,16 +2184,16 @@ }, { "name": "tinymce/tinymce", - "version": "4.6.6", + "version": "4.7.1", "source": { "type": "git", "url": "https://github.com/tinymce/tinymce-dist.git", - "reference": "50b5a77af8ef1a1da362e60ad32ace4131e2dbf0" + "reference": "4fd91026d3765fee9b148b5e684b014a8e18ead1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/50b5a77af8ef1a1da362e60ad32ace4131e2dbf0", - "reference": "50b5a77af8ef1a1da362e60ad32ace4131e2dbf0", + "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/4fd91026d3765fee9b148b5e684b014a8e18ead1", + "reference": "4fd91026d3765fee9b148b5e684b014a8e18ead1", "shasum": "" }, "type": "component", @@ -2223,7 +2226,7 @@ "tinymce", "wysiwyg" ], - "time": "2017-08-30 12:11:58" + "time": "2017-10-09 13:17:31" }, { "name": "tomazdragar/SimpleCropper", @@ -2237,34 +2240,38 @@ }, { "name": "twig/twig", - "version": "v1.28.2", + "version": "v1.35.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c" + "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/b22ce0eb070e41f7cba65d78fe216de29726459c", - "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f", + "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f", "shasum": "" }, "require": { - "php": ">=5.2.7" + "php": ">=5.3.3" }, "require-dev": { + "psr/container": "^1.0", "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~3.2@dev" + "symfony/phpunit-bridge": "~3.3@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.28-dev" + "dev-master": "1.35-dev" } }, "autoload": { "psr-0": { "Twig_": "lib/" + }, + "psr-4": { + "Twig\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2294,56 +2301,7 @@ "keywords": [ "templating" ], - "time": "2016-11-23 18:41:40" - }, - { - "name": "wikimedia/composer-merge-plugin", - "version": "v1.3.1", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/composer-merge-plugin.git", - "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4", - "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": ">=5.3.2" - }, - "require-dev": { - "composer/composer": "1.0.*@dev", - "jakub-onderka/php-parallel-lint": "~0.8", - "phpunit/phpunit": "~4.8|~5.0", - "squizlabs/php_codesniffer": "~2.1.0" - }, - "type": "composer-plugin", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - }, - "class": "Wikimedia\\Composer\\MergePlugin" - }, - "autoload": { - "psr-4": { - "Wikimedia\\Composer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bryan Davis", - "email": "bd808@wikimedia.org" - } - ], - "description": "Composer plugin to merge multiple composer.json files", - "time": "2016-03-08 17:11:37" + "time": "2017-09-27 18:06:46" }, { "name": "zetacomponents/base", @@ -2729,28 +2687,18 @@ } ], "packages-dev": [ - { - "name": "jquery-archive/jquery-metadata", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/jquery-archive/jquery-metadata.git", - "reference": "e5a9e4315675bf4d68716872ca754e858088f8ab" - }, - "type": "library" - }, { "name": "squizlabs/php_codesniffer", - "version": "2.7.1", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f" + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9b324f3a1132459a7274a0ace2e1b766ba80930f", - "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", "shasum": "" }, "require": { @@ -2815,7 +2763,7 @@ "phpcs", "standards" ], - "time": "2016-11-30 04:02:31" + "time": "2017-05-22 02:43:20" } ], "aliases": [], diff --git a/submodules/bootstrap b/submodules/bootstrap deleted file mode 160000 index bcf7dd38b..000000000 --- a/submodules/bootstrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bcf7dd38b5ab180256e2e4fb5da0369551b3f082 diff --git a/submodules/pivottable b/submodules/pivottable deleted file mode 160000 index 2f3d5cd8c..000000000 --- a/submodules/pivottable +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2f3d5cd8c69c9f888a70ce978c62e5e89380e7b3