From c9a00c63a59eb9d4ec65e27bb4eb30be3490028e Mon Sep 17 00:00:00 2001 From: Bertrand Dunogier Date: Fri, 3 Jul 2015 15:05:30 +0200 Subject: [PATCH] [tmp,req] Changed platform ui to master for testing --- composer.json | 2 +- composer.lock | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 7cb2ccd65e..d7d2b81c46 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "tedivm/stash-bundle": "0.4.*", "ezsystems/ezpublish-kernel": "dev-master", "ezsystems/repository-forms": "~0.1", - "ezsystems/platform-ui-bundle": "~0.9", + "ezsystems/platform-ui-bundle": "dev-master", "ezsystems/platform-ui-assets-bundle": "~0.2", "ezsystems/demobundle": "~6.0@alpha", "ezsystems/comments-bundle": "~6.0@alpha", diff --git a/composer.lock b/composer.lock index ebdce752e5..b5cca8e211 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "b2961b26f5e3806eaf19351924cd97ba", + "hash": "3be27eb10214f6be91b8ddcad6b14773", "packages": [ { "name": "components/bootstrap", @@ -1041,22 +1041,22 @@ }, { "name": "ezsystems/platform-ui-bundle", - "version": "v0.9.2", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/ezsystems/PlatformUIBundle.git", - "reference": "1ef79f1b42c55821de60c42df9c11130423d501d" + "reference": "5900285b5fd096e954cc43bc78c24ab91074f5d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezsystems/PlatformUIBundle/zipball/1ef79f1b42c55821de60c42df9c11130423d501d", - "reference": "1ef79f1b42c55821de60c42df9c11130423d501d", + "url": "https://api.github.com/repos/ezsystems/PlatformUIBundle/zipball/5900285b5fd096e954cc43bc78c24ab91074f5d4", + "reference": "5900285b5fd096e954cc43bc78c24ab91074f5d4", "shasum": "" }, "require": { - "ezsystems/ezpublish-kernel": "~6.0@alpha", - "ezsystems/platform-ui-assets-bundle": "~0.8", - "ezsystems/repository-forms": "~0.1", + "ezsystems/ezpublish-kernel": "~6.0@dev", + "ezsystems/platform-ui-assets-bundle": "~0.2", + "ezsystems/repository-forms": "~0.1@dev", "zetacomponents/system-information": "~1.1" }, "require-dev": { @@ -1064,6 +1064,11 @@ "phpunit/phpunit": "~4.7" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.8.x-dev" + } + }, "autoload": { "psr-4": { "EzSystems\\PlatformUIBundle\\": "" @@ -1074,7 +1079,7 @@ "GPL-2.0" ], "description": "eZ Platform UI Bundle", - "time": "2015-06-30 15:42:57" + "time": "2015-07-02 13:55:42" }, { "name": "ezsystems/privacy-cookie-bundle", @@ -5494,6 +5499,7 @@ "minimum-stability": "stable", "stability-flags": { "ezsystems/ezpublish-kernel": 20, + "ezsystems/platform-ui-bundle": 20, "ezsystems/demobundle": 15, "ezsystems/comments-bundle": 15, "behat/sahi-client": 20,