diff --git a/composer.json b/composer.json index a5148c5..6bdd3b4 100644 --- a/composer.json +++ b/composer.json @@ -42,15 +42,14 @@ "kriswallsmith/assetic": "v1.1.1", "braincrafted/bootstrap-bundle": "~2.0", "leafo/lessphp": "0.4.0", - "twitter/bootstrap": "2.3.*", "knplabs/knp-paginator-bundle": "dev-master", "doctrine/data-fixtures": "dev-master", "doctrine/doctrine-fixtures-bundle": "dev-master", "ijanki/ftp-bundle": "*", "jms/translation-bundle": "1.1.*@dev", "helios-ag/fm-elfinder-bundle": "1.x", - "knplabs/knp-menu": "2.0.*@dev", - "knplabs/knp-menu-bundle":"dev-master", + "knplabs/knp-menu": "2.0.*@alpha", + "knplabs/knp-menu-bundle": "2.0.*@alpha", "jpgraph/jpgraph": "dev-master", "symfony/class-loader": "2.2.*", "friendsofsymfony/rest-bundle": "dev-master", diff --git a/composer.lock b/composer.lock index 5c13cff..3b85c4c 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "1a093ce481c9852ef22c1ca95a5cbf08", + "hash": "7b0319266c174918185313801b3e4139", "packages": [ { "name": "braincrafted/bootstrap-bundle", @@ -1876,16 +1876,16 @@ }, { "name": "knplabs/knp-menu", - "version": "dev-master", + "version": "v2.0.0-alpha1", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMenu.git", - "reference": "777f70f168cd49c0be27936d716fe57835eaa9ae" + "reference": "323c0e6c3471208ab86e1cac561febd5c63cef52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/777f70f168cd49c0be27936d716fe57835eaa9ae", - "reference": "777f70f168cd49c0be27936d716fe57835eaa9ae", + "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/323c0e6c3471208ab86e1cac561febd5c63cef52", + "reference": "323c0e6c3471208ab86e1cac561febd5c63cef52", "shasum": "" }, "require": { @@ -1936,25 +1936,25 @@ "menu", "tree" ], - "time": "2014-04-05 12:43:14" + "time": "2013-06-23 19:58:17" }, { "name": "knplabs/knp-menu-bundle", - "version": "dev-master", + "version": "v2.0.0-alpha1", "target-dir": "Knp/Bundle/MenuBundle", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMenuBundle.git", - "reference": "e5700ed8cbd5c402d24d6dda118aa23400937288" + "reference": "000b50881aff2831cdaadb8672e57e1b1502d643" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/e5700ed8cbd5c402d24d6dda118aa23400937288", - "reference": "e5700ed8cbd5c402d24d6dda118aa23400937288", + "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/000b50881aff2831cdaadb8672e57e1b1502d643", + "reference": "000b50881aff2831cdaadb8672e57e1b1502d643", "shasum": "" }, "require": { - "knplabs/knp-menu": "~2.0, >=2.0.0-beta1", + "knplabs/knp-menu": "2.0.*", "symfony/framework-bundle": "~2.0" }, "type": "symfony-bundle", @@ -1990,7 +1990,7 @@ "keywords": [ "menu" ], - "time": "2014-03-03 22:44:01" + "time": "2013-06-23 23:46:58" }, { "name": "knplabs/knp-paginator-bundle", @@ -3194,33 +3194,6 @@ "time": "2014-02-13 10:19:29" }, { - "name": "twitter/bootstrap", - "version": "v2.3.2", - "source": { - "type": "git", - "url": "https://github.com/twbs/bootstrap.git", - "reference": "b4c4072679943773a7582daa63f545ba818fa627" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/b4c4072679943773a7582daa63f545ba818fa627", - "reference": "b4c4072679943773a7582daa63f545ba818fa627", - "shasum": "" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", - "homepage": "http://twbs.github.com/bootstrap/", - "keywords": [ - "bootstrap", - "css" - ], - "time": "2013-07-27 06:36:38" - }, - { "name": "willdurand/jsonp-callback-validator", "version": "v1.1.0", "source": { @@ -3323,8 +3296,8 @@ "doctrine/data-fixtures": 20, "doctrine/doctrine-fixtures-bundle": 20, "jms/translation-bundle": 20, - "knplabs/knp-menu": 20, - "knplabs/knp-menu-bundle": 20, + "knplabs/knp-menu": 15, + "knplabs/knp-menu-bundle": 15, "jpgraph/jpgraph": 20, "friendsofsymfony/rest-bundle": 20, "jms/serializer": 20, -- libgit2 0.21.2