From dd5697a45473a139f8dfeea66235a38cb5ac9b46 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 15 Jun 2017 14:29:03 +0200 Subject: lock versions for resolving conflicts in bower --- composer.lock | 61 +++++++++++++++++++++++++++++------------------------------ js/bower.json | 4 ++++ 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index 22b3167b8..974a2d926 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,6 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "63a65f12a3a13c77aa65e51a30bfef52", "content-hash": "3e09cb824fc2eb931014dc99a3b5b648", "packages": [ { @@ -52,7 +51,7 @@ "keywords": [ "html" ], - "time": "2017-06-03 02:28:16" + "time": "2017-06-03T02:28:16+00:00" }, { "name": "miniflux/picofeed", @@ -105,7 +104,7 @@ ], "description": "Modern library to handle RSS/Atom feeds", "homepage": "https://github.com/miniflux/picoFeed", - "time": "2017-06-12 00:22:06" + "time": "2017-06-12T00:22:06+00:00" }, { "name": "pear/net_url2", @@ -166,7 +165,7 @@ "uri", "url" ], - "time": "2016-04-18 22:24:01" + "time": "2016-04-18T22:24:01+00:00" }, { "name": "riimu/kit-pathjoin", @@ -211,7 +210,7 @@ "path", "system" ], - "time": "2015-08-22 11:29:24" + "time": "2015-08-22T11:29:24+00:00" }, { "name": "zendframework/zendxml", @@ -256,7 +255,7 @@ "xml", "zf2" ], - "time": "2016-02-04 21:02:08" + "time": "2016-02-04T21:02:08+00:00" } ], "packages-dev": [ @@ -312,7 +311,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "myclabs/deep-copy", @@ -354,7 +353,7 @@ "object", "object graph" ], - "time": "2017-04-12 18:52:22" + "time": "2017-04-12T18:52:22+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -408,7 +407,7 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-27T11:43:31+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -453,7 +452,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30 07:12:33" + "time": "2016-09-30T07:12:33+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -500,7 +499,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25 06:54:22" + "time": "2016-11-25T06:54:22+00:00" }, { "name": "phpspec/prophecy", @@ -563,7 +562,7 @@ "spy", "stub" ], - "time": "2017-03-02 20:05:34" + "time": "2017-03-02T20:05:34+00:00" }, { "name": "phpunit/php-code-coverage", @@ -626,7 +625,7 @@ "testing", "xunit" ], - "time": "2017-04-02 07:44:40" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -673,7 +672,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03 07:40:28" + "time": "2016-10-03T07:40:28+00:00" }, { "name": "phpunit/php-text-template", @@ -714,7 +713,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -763,7 +762,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26 11:10:40" + "time": "2017-02-26T11:10:40+00:00" }, { "name": "phpunit/php-token-stream", @@ -812,7 +811,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27 10:12:30" + "time": "2017-02-27T10:12:30+00:00" }, { "name": "phpunit/phpunit", @@ -894,7 +893,7 @@ "testing", "xunit" ], - "time": "2017-05-22 07:42:55" + "time": "2017-05-22T07:42:55+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -953,7 +952,7 @@ "mock", "xunit" ], - "time": "2016-12-08 20:27:08" + "time": "2016-12-08T20:27:08+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -998,7 +997,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04 06:30:41" + "time": "2017-03-04T06:30:41+00:00" }, { "name": "sebastian/comparator", @@ -1062,7 +1061,7 @@ "compare", "equality" ], - "time": "2017-01-29 09:50:25" + "time": "2017-01-29T09:50:25+00:00" }, { "name": "sebastian/diff", @@ -1114,7 +1113,7 @@ "keywords": [ "diff" ], - "time": "2017-05-22 07:24:03" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", @@ -1164,7 +1163,7 @@ "environment", "hhvm" ], - "time": "2016-11-26 07:53:53" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", @@ -1231,7 +1230,7 @@ "export", "exporter" ], - "time": "2016-11-19 08:54:04" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -1282,7 +1281,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -1328,7 +1327,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18 15:18:39" + "time": "2017-02-18T15:18:39+00:00" }, { "name": "sebastian/recursion-context", @@ -1381,7 +1380,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19 07:33:16" + "time": "2016-11-19T07:33:16+00:00" }, { "name": "sebastian/resource-operations", @@ -1423,7 +1422,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -1466,7 +1465,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/yaml", @@ -1521,7 +1520,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-06-02 22:05:06" + "time": "2017-06-02T22:05:06+00:00" }, { "name": "webmozart/assert", @@ -1571,7 +1570,7 @@ "check", "validate" ], - "time": "2016-11-23 20:04:58" + "time": "2016-11-23T20:04:58+00:00" } ], "aliases": [], diff --git a/js/bower.json b/js/bower.json index e5e6c29f9..7d14e4387 100644 --- a/js/bower.json +++ b/js/bower.json @@ -32,5 +32,9 @@ "es6-shim": "~0.35.0", "js-url": "~2.5.0", "masonry": "~4.2.0" + }, + "resolutions": { + "outlayer": "^2.1.0", + "angular": "1.6.4" } } -- cgit v1.2.3