Commit 6069bc1079c550ab93ea8e39d70386ff77d15ea4

Authored by Eduardo Santos
1 parent d1f285f2
Exists in master and in 1 other branch 3.1

Arruma dependências para funcionar o Menu

Showing 2 changed files with 16 additions and 44 deletions   Show diff stats
@@ -42,15 +42,14 @@ @@ -42,15 +42,14 @@
42 "kriswallsmith/assetic": "v1.1.1", 42 "kriswallsmith/assetic": "v1.1.1",
43 "braincrafted/bootstrap-bundle": "~2.0", 43 "braincrafted/bootstrap-bundle": "~2.0",
44 "leafo/lessphp": "0.4.0", 44 "leafo/lessphp": "0.4.0",
45 - "twitter/bootstrap": "2.3.*",  
46 "knplabs/knp-paginator-bundle": "dev-master", 45 "knplabs/knp-paginator-bundle": "dev-master",
47 "doctrine/data-fixtures": "dev-master", 46 "doctrine/data-fixtures": "dev-master",
48 "doctrine/doctrine-fixtures-bundle": "dev-master", 47 "doctrine/doctrine-fixtures-bundle": "dev-master",
49 "ijanki/ftp-bundle": "*", 48 "ijanki/ftp-bundle": "*",
50 "jms/translation-bundle": "1.1.*@dev", 49 "jms/translation-bundle": "1.1.*@dev",
51 "helios-ag/fm-elfinder-bundle": "1.x", 50 "helios-ag/fm-elfinder-bundle": "1.x",
52 - "knplabs/knp-menu": "2.0.*@dev",  
53 - "knplabs/knp-menu-bundle":"dev-master", 51 + "knplabs/knp-menu": "2.0.*@alpha",
  52 + "knplabs/knp-menu-bundle": "2.0.*@alpha",
54 "jpgraph/jpgraph": "dev-master", 53 "jpgraph/jpgraph": "dev-master",
55 "symfony/class-loader": "2.2.*", 54 "symfony/class-loader": "2.2.*",
56 "friendsofsymfony/rest-bundle": "dev-master", 55 "friendsofsymfony/rest-bundle": "dev-master",
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 "This file locks the dependencies of your project to a known state", 3 "This file locks the dependencies of your project to a known state",
4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" 4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
5 ], 5 ],
6 - "hash": "1a093ce481c9852ef22c1ca95a5cbf08", 6 + "hash": "7b0319266c174918185313801b3e4139",
7 "packages": [ 7 "packages": [
8 { 8 {
9 "name": "braincrafted/bootstrap-bundle", 9 "name": "braincrafted/bootstrap-bundle",
@@ -1876,16 +1876,16 @@ @@ -1876,16 +1876,16 @@
1876 }, 1876 },
1877 { 1877 {
1878 "name": "knplabs/knp-menu", 1878 "name": "knplabs/knp-menu",
1879 - "version": "dev-master", 1879 + "version": "v2.0.0-alpha1",
1880 "source": { 1880 "source": {
1881 "type": "git", 1881 "type": "git",
1882 "url": "https://github.com/KnpLabs/KnpMenu.git", 1882 "url": "https://github.com/KnpLabs/KnpMenu.git",
1883 - "reference": "777f70f168cd49c0be27936d716fe57835eaa9ae" 1883 + "reference": "323c0e6c3471208ab86e1cac561febd5c63cef52"
1884 }, 1884 },
1885 "dist": { 1885 "dist": {
1886 "type": "zip", 1886 "type": "zip",
1887 - "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/777f70f168cd49c0be27936d716fe57835eaa9ae",  
1888 - "reference": "777f70f168cd49c0be27936d716fe57835eaa9ae", 1887 + "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/323c0e6c3471208ab86e1cac561febd5c63cef52",
  1888 + "reference": "323c0e6c3471208ab86e1cac561febd5c63cef52",
1889 "shasum": "" 1889 "shasum": ""
1890 }, 1890 },
1891 "require": { 1891 "require": {
@@ -1936,25 +1936,25 @@ @@ -1936,25 +1936,25 @@
1936 "menu", 1936 "menu",
1937 "tree" 1937 "tree"
1938 ], 1938 ],
1939 - "time": "2014-04-05 12:43:14" 1939 + "time": "2013-06-23 19:58:17"
1940 }, 1940 },
1941 { 1941 {
1942 "name": "knplabs/knp-menu-bundle", 1942 "name": "knplabs/knp-menu-bundle",
1943 - "version": "dev-master", 1943 + "version": "v2.0.0-alpha1",
1944 "target-dir": "Knp/Bundle/MenuBundle", 1944 "target-dir": "Knp/Bundle/MenuBundle",
1945 "source": { 1945 "source": {
1946 "type": "git", 1946 "type": "git",
1947 "url": "https://github.com/KnpLabs/KnpMenuBundle.git", 1947 "url": "https://github.com/KnpLabs/KnpMenuBundle.git",
1948 - "reference": "e5700ed8cbd5c402d24d6dda118aa23400937288" 1948 + "reference": "000b50881aff2831cdaadb8672e57e1b1502d643"
1949 }, 1949 },
1950 "dist": { 1950 "dist": {
1951 "type": "zip", 1951 "type": "zip",
1952 - "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/e5700ed8cbd5c402d24d6dda118aa23400937288",  
1953 - "reference": "e5700ed8cbd5c402d24d6dda118aa23400937288", 1952 + "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/000b50881aff2831cdaadb8672e57e1b1502d643",
  1953 + "reference": "000b50881aff2831cdaadb8672e57e1b1502d643",
1954 "shasum": "" 1954 "shasum": ""
1955 }, 1955 },
1956 "require": { 1956 "require": {
1957 - "knplabs/knp-menu": "~2.0, >=2.0.0-beta1", 1957 + "knplabs/knp-menu": "2.0.*",
1958 "symfony/framework-bundle": "~2.0" 1958 "symfony/framework-bundle": "~2.0"
1959 }, 1959 },
1960 "type": "symfony-bundle", 1960 "type": "symfony-bundle",
@@ -1990,7 +1990,7 @@ @@ -1990,7 +1990,7 @@
1990 "keywords": [ 1990 "keywords": [
1991 "menu" 1991 "menu"
1992 ], 1992 ],
1993 - "time": "2014-03-03 22:44:01" 1993 + "time": "2013-06-23 23:46:58"
1994 }, 1994 },
1995 { 1995 {
1996 "name": "knplabs/knp-paginator-bundle", 1996 "name": "knplabs/knp-paginator-bundle",
@@ -3194,33 +3194,6 @@ @@ -3194,33 +3194,6 @@
3194 "time": "2014-02-13 10:19:29" 3194 "time": "2014-02-13 10:19:29"
3195 }, 3195 },
3196 { 3196 {
3197 - "name": "twitter/bootstrap",  
3198 - "version": "v2.3.2",  
3199 - "source": {  
3200 - "type": "git",  
3201 - "url": "https://github.com/twbs/bootstrap.git",  
3202 - "reference": "b4c4072679943773a7582daa63f545ba818fa627"  
3203 - },  
3204 - "dist": {  
3205 - "type": "zip",  
3206 - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/b4c4072679943773a7582daa63f545ba818fa627",  
3207 - "reference": "b4c4072679943773a7582daa63f545ba818fa627",  
3208 - "shasum": ""  
3209 - },  
3210 - "type": "library",  
3211 - "notification-url": "https://packagist.org/downloads/",  
3212 - "license": [  
3213 - "Apache-2.0"  
3214 - ],  
3215 - "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",  
3216 - "homepage": "http://twbs.github.com/bootstrap/",  
3217 - "keywords": [  
3218 - "bootstrap",  
3219 - "css"  
3220 - ],  
3221 - "time": "2013-07-27 06:36:38"  
3222 - },  
3223 - {  
3224 "name": "willdurand/jsonp-callback-validator", 3197 "name": "willdurand/jsonp-callback-validator",
3225 "version": "v1.1.0", 3198 "version": "v1.1.0",
3226 "source": { 3199 "source": {
@@ -3323,8 +3296,8 @@ @@ -3323,8 +3296,8 @@
3323 "doctrine/data-fixtures": 20, 3296 "doctrine/data-fixtures": 20,
3324 "doctrine/doctrine-fixtures-bundle": 20, 3297 "doctrine/doctrine-fixtures-bundle": 20,
3325 "jms/translation-bundle": 20, 3298 "jms/translation-bundle": 20,
3326 - "knplabs/knp-menu": 20,  
3327 - "knplabs/knp-menu-bundle": 20, 3299 + "knplabs/knp-menu": 15,
  3300 + "knplabs/knp-menu-bundle": 15,
3328 "jpgraph/jpgraph": 20, 3301 "jpgraph/jpgraph": 20,
3329 "friendsofsymfony/rest-bundle": 20, 3302 "friendsofsymfony/rest-bundle": 20,
3330 "jms/serializer": 20, 3303 "jms/serializer": 20,