Download as
Browse Code »

Commit c52ba58f6a77fd9ad64c5c6327ed24f0b50c53e5

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

Corrige erros de configuração e desabilita uglify como obrigatório

Showing 2 changed files with 81 additions and 76 deletions   Show diff stats
app/config/config.yml
  Diff comments   View file @c52ba58
... ... @@ -134,6 +134,7 @@ knp_paginator:
134 134 fm_elfinder:
135 135 locale: %locale%
136 136 editor: simple
  137 + compression: false
137 138 connector:
138 139 roots:
139 140 downloads:
... ... @@ -167,4 +168,4 @@ services:
167 168 cacic_demo.command.demo_command:
168 169 class: Cacic\CommonBundle\Command\DemoCommand
169 170 tags:
170   - - { name: console.command }
171 171 \ No newline at end of file
  172 + - { name: console.command }
... ...
composer.lock
  Diff comments   View file @c52ba58
... ... @@ -219,7 +219,8 @@
219 219 {
220 220 "name": "Jonathan Wage",
221 221 "email": "jonwage@gmail.com",
222   - "homepage": "http://www.jwage.com/"
  222 + "homepage": "http://www.jwage.com/",
  223 + "role": "Creator"
223 224 },
224 225 {
225 226 "name": "Guilherme Blanco",
... ... @@ -433,7 +434,8 @@
433 434 {
434 435 "name": "Jonathan Wage",
435 436 "email": "jonwage@gmail.com",
436   - "homepage": "http://www.jwage.com/"
  437 + "homepage": "http://www.jwage.com/",
  438 + "role": "Creator"
437 439 },
438 440 {
439 441 "name": "Guilherme Blanco",
... ... @@ -528,12 +530,12 @@
528 530 "source": {
529 531 "type": "git",
530 532 "url": "https://github.com/doctrine/dbal.git",
531   - "reference": "2.3.4"
  533 + "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13"
532 534 },
533 535 "dist": {
534 536 "type": "zip",
535   - "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.4",
536   - "reference": "2.3.4",
  537 + "url": "https://api.github.com/repos/doctrine/dbal/zipball/2a37b007dda8e21bdbb8fa445be8fa0064199e13",
  538 + "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13",
537 539 "shasum": ""
538 540 },
539 541 "require": {
... ... @@ -559,7 +561,8 @@
559 561 {
560 562 "name": "Jonathan Wage",
561 563 "email": "jonwage@gmail.com",
562   - "homepage": "http://www.jwage.com/"
  564 + "homepage": "http://www.jwage.com/",
  565 + "role": "Creator"
563 566 },
564 567 {
565 568 "name": "Guilherme Blanco",
... ... @@ -592,25 +595,25 @@
592 595 "source": {
593 596 "type": "git",
594 597 "url": "https://github.com/doctrine/DoctrineBundle.git",
595   - "reference": "v1.2.0"
  598 + "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9"
596 599 },
597 600 "dist": {
598 601 "type": "zip",
599   - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/v1.2.0",
600   - "reference": "v1.2.0",
  602 + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/765b0d87fcc3e839c74817b7211258cbef3a4fb9",
  603 + "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9",
601 604 "shasum": ""
602 605 },
603 606 "require": {
604 607 "doctrine/dbal": ">=2.2,<2.5-dev",
605   - "jdorn/sql-formatter": ">=1.1,<2.0",
  608 + "jdorn/sql-formatter": "~1.1",
606 609 "php": ">=5.3.2",
607   - "symfony/doctrine-bridge": ">=2.2,<3.0",
608   - "symfony/framework-bundle": ">=2.2,<3.0"
  610 + "symfony/doctrine-bridge": "~2.2",
  611 + "symfony/framework-bundle": "~2.2"
609 612 },
610 613 "require-dev": {
611 614 "doctrine/orm": ">=2.2,<2.5-dev",
612   - "symfony/validator": ">=2.2,<3.0",
613   - "symfony/yaml": ">=2.2,<3.0"
  615 + "symfony/validator": "~2.2",
  616 + "symfony/yaml": "~2.2"
614 617 },
615 618 "suggest": {
616 619 "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
... ... @@ -746,7 +749,8 @@
746 749 {
747 750 "name": "Jonathan Wage",
748 751 "email": "jonwage@gmail.com",
749   - "homepage": "http://www.jwage.com/"
  752 + "homepage": "http://www.jwage.com/",
  753 + "role": "Creator"
750 754 },
751 755 {
752 756 "name": "Guilherme Blanco",
... ... @@ -762,7 +766,7 @@
762 766 "email": "kontakt@beberlei.de"
763 767 },
764 768 {
765   - "name": "Johannes M. Schmitt",
  769 + "name": "Johannes Schmitt",
766 770 "email": "schmittjoh@gmail.com",
767 771 "homepage": "http://jmsyst.com",
768 772 "role": "Developer of wrapped JMSSerializerBundle"
... ... @@ -1281,13 +1285,13 @@
1281 1285 "version": "1.0.0",
1282 1286 "source": {
1283 1287 "type": "git",
1284   - "url": "git://github.com/schmittjoh/cg-library.git",
1285   - "reference": "1.0.0"
  1288 + "url": "https://github.com/schmittjoh/cg-library.git",
  1289 + "reference": "ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc"
1286 1290 },
1287 1291 "dist": {
1288 1292 "type": "zip",
1289   - "url": "https://github.com/schmittjoh/cg-library/zipball/1.0.0",
1290   - "reference": "1.0.0",
  1293 + "url": "https://api.github.com/repos/schmittjoh/cg-library/zipball/ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc",
  1294 + "reference": "ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc",
1291 1295 "shasum": ""
1292 1296 },
1293 1297 "require": {
... ... @@ -1315,7 +1319,7 @@
1315 1319 "keywords": [
1316 1320 "code generation"
1317 1321 ],
1318   - "time": "2012-01-02 12:40:52"
  1322 + "time": "2012-01-02 20:40:52"
1319 1323 },
1320 1324 {
1321 1325 "name": "jms/di-extra-bundle",
... ... @@ -1324,20 +1328,20 @@
1324 1328 "source": {
1325 1329 "type": "git",
1326 1330 "url": "https://github.com/schmittjoh/JMSDiExtraBundle.git",
1327   - "reference": "1.4.0"
  1331 + "reference": "7fffdb6c96fb922a131af06d773e1e6c5301d070"
1328 1332 },
1329 1333 "dist": {
1330 1334 "type": "zip",
1331   - "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/1.4.0",
1332   - "reference": "1.4.0",
  1335 + "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/7fffdb6c96fb922a131af06d773e1e6c5301d070",
  1336 + "reference": "7fffdb6c96fb922a131af06d773e1e6c5301d070",
1333 1337 "shasum": ""
1334 1338 },
1335 1339 "require": {
1336 1340 "jms/aop-bundle": ">=1.0.0,<1.2-dev",
1337 1341 "jms/metadata": "1.*",
1338   - "symfony/finder": ">=2.1,<3.0",
1339   - "symfony/framework-bundle": ">=2.1,<3.0",
1340   - "symfony/process": ">=2.1,<3.0"
  1342 + "symfony/finder": "~2.1",
  1343 + "symfony/framework-bundle": "~2.1",
  1344 + "symfony/process": "~2.1"
1341 1345 },
1342 1346 "require-dev": {
1343 1347 "doctrine/doctrine-bundle": "*",
... ... @@ -1421,7 +1425,7 @@
1421 1425 ],
1422 1426 "authors": [
1423 1427 {
1424   - "name": "Johannes Schmitt",
  1428 + "name": "Johannes M. Schmitt",
1425 1429 "email": "schmittjoh@gmail.com",
1426 1430 "homepage": "http://jmsyst.com",
1427 1431 "role": "Developer of wrapped JMSSerializerBundle"
... ... @@ -1441,13 +1445,13 @@
1441 1445 "version": "1.0.0",
1442 1446 "source": {
1443 1447 "type": "git",
1444   - "url": "git://github.com/schmittjoh/parser-lib",
1445   - "reference": "1.0.0"
  1448 + "url": "https://github.com/schmittjoh/parser-lib.git",
  1449 + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
1446 1450 },
1447 1451 "dist": {
1448 1452 "type": "zip",
1449   - "url": "https://github.com/schmittjoh/parser-lib/archive/1.0.0.zip",
1450   - "reference": "1.0.0",
  1453 + "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
  1454 + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
1451 1455 "shasum": ""
1452 1456 },
1453 1457 "require": {
... ... @@ -1478,20 +1482,20 @@
1478 1482 "source": {
1479 1483 "type": "git",
1480 1484 "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle.git",
1481   - "reference": "1.5.1"
  1485 + "reference": "f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc"
1482 1486 },
1483 1487 "dist": {
1484 1488 "type": "zip",
1485   - "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/1.5.1",
1486   - "reference": "1.5.1",
  1489 + "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc",
  1490 + "reference": "f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc",
1487 1491 "shasum": ""
1488 1492 },
1489 1493 "require": {
1490   - "jms/aop-bundle": ">=1.0,<2.0",
1491   - "jms/di-extra-bundle": ">=1.3,<2.0",
1492   - "jms/metadata": ">=1.0,<2.0",
1493   - "jms/parser-lib": ">=1.0,<2.0",
1494   - "symfony/framework-bundle": ">=2.1,<3.0",
  1494 + "jms/aop-bundle": "~1.0",
  1495 + "jms/di-extra-bundle": "~1.3",
  1496 + "jms/metadata": "~1.0",
  1497 + "jms/parser-lib": "~1.0",
  1498 + "symfony/framework-bundle": "~2.1",
1495 1499 "symfony/security-bundle": "*"
1496 1500 },
1497 1501 "require-dev": {
... ... @@ -2051,17 +2055,17 @@
2051 2055 "source": {
2052 2056 "type": "git",
2053 2057 "url": "https://github.com/kriswallsmith/assetic.git",
2054   - "reference": "v1.1.1"
  2058 + "reference": "a826e4b96f5c607ff47ef61caf3826b2b1e840ec"
2055 2059 },
2056 2060 "dist": {
2057 2061 "type": "zip",
2058   - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/v1.1.1",
2059   - "reference": "v1.1.1",
  2062 + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/a826e4b96f5c607ff47ef61caf3826b2b1e840ec",
  2063 + "reference": "a826e4b96f5c607ff47ef61caf3826b2b1e840ec",
2060 2064 "shasum": ""
2061 2065 },
2062 2066 "require": {
2063 2067 "php": ">=5.3.1",
2064   - "symfony/process": ">=2.1,<3.0"
  2068 + "symfony/process": "~2.1"
2065 2069 },
2066 2070 "require-dev": {
2067 2071 "cssmin/cssmin": "*",
... ... @@ -2071,9 +2075,9 @@
2071 2075 "leafo/scssphp": "*",
2072 2076 "leafo/scssphp-compass": "*",
2073 2077 "mrclay/minify": "*",
2074   - "phpunit/phpunit": ">=3.7,<4.0",
  2078 + "phpunit/phpunit": "~3.7",
2075 2079 "ptachoire/cssembed": "*",
2076   - "twig/twig": ">=1.6,<2.0"
  2080 + "twig/twig": "~1.6"
2077 2081 },
2078 2082 "suggest": {
2079 2083 "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
... ... @@ -2164,12 +2168,12 @@
2164 2168 "source": {
2165 2169 "type": "git",
2166 2170 "url": "https://github.com/lightbase/cocar.git",
2167   - "reference": "8465bec2675d2f6b96b60a9ef59a95f4c25ef54e"
  2171 + "reference": "2fc869b73608ed4d7821e7a2752cd555fc912dfd"
2168 2172 },
2169 2173 "dist": {
2170 2174 "type": "zip",
2171   - "url": "https://api.github.com/repos/lightbase/cocar/zipball/8465bec2675d2f6b96b60a9ef59a95f4c25ef54e",
2172   - "reference": "8465bec2675d2f6b96b60a9ef59a95f4c25ef54e",
  2175 + "url": "https://api.github.com/repos/lightbase/cocar/zipball/2fc869b73608ed4d7821e7a2752cd555fc912dfd",
  2176 + "reference": "2fc869b73608ed4d7821e7a2752cd555fc912dfd",
2173 2177 "shasum": ""
2174 2178 },
2175 2179 "require": {
... ... @@ -2200,7 +2204,7 @@
2200 2204 "support": {
2201 2205 "source": "https://github.com/lightbase/cocar/tree/master"
2202 2206 },
2203   - "time": "2014-03-29 05:16:50"
  2207 + "time": "2014-04-09 13:43:42"
2204 2208 },
2205 2209 {
2206 2210 "name": "monolog/monolog",
... ... @@ -2418,13 +2422,13 @@
2418 2422 "version": "1.0.0",
2419 2423 "source": {
2420 2424 "type": "git",
2421   - "url": "https://github.com/php-fig/log",
2422   - "reference": "1.0.0"
  2425 + "url": "https://github.com/php-fig/log.git",
  2426 + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
2423 2427 },
2424 2428 "dist": {
2425 2429 "type": "zip",
2426   - "url": "https://github.com/php-fig/log/archive/1.0.0.zip",
2427   - "reference": "1.0.0",
  2430 + "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
  2431 + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
2428 2432 "shasum": ""
2429 2433 },
2430 2434 "type": "library",
... ... @@ -2650,27 +2654,27 @@
2650 2654 "source": {
2651 2655 "type": "git",
2652 2656 "url": "https://github.com/symfony/AsseticBundle.git",
2653   - "reference": "v2.3.0"
  2657 + "reference": "146dd3cb46b302bd471560471c6aaa930483dac1"
2654 2658 },
2655 2659 "dist": {
2656 2660 "type": "zip",
2657   - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/v2.3.0",
2658   - "reference": "v2.3.0",
  2661 + "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/146dd3cb46b302bd471560471c6aaa930483dac1",
  2662 + "reference": "146dd3cb46b302bd471560471c6aaa930483dac1",
2659 2663 "shasum": ""
2660 2664 },
2661 2665 "require": {
2662   - "kriswallsmith/assetic": ">=1.1,<2.0",
  2666 + "kriswallsmith/assetic": "~1.1",
2663 2667 "php": ">=5.3.0",
2664   - "symfony/framework-bundle": ">=2.1,<3.0"
  2668 + "symfony/framework-bundle": "~2.1"
2665 2669 },
2666 2670 "require-dev": {
2667   - "symfony/class-loader": ">=2.1,<3.0",
2668   - "symfony/console": ">=2.1,<3.0",
2669   - "symfony/css-selector": ">=2.1,<3.0",
2670   - "symfony/dom-crawler": ">=2.1,<3.0",
2671   - "symfony/form": ">=2.1,<3.0",
2672   - "symfony/twig-bundle": ">=2.1,<3.0",
2673   - "symfony/yaml": ">=2.1,<3.0"
  2671 + "symfony/class-loader": "~2.1",
  2672 + "symfony/console": "~2.1",
  2673 + "symfony/css-selector": "~2.1",
  2674 + "symfony/dom-crawler": "~2.1",
  2675 + "symfony/form": "~2.1",
  2676 + "symfony/twig-bundle": "~2.1",
  2677 + "symfony/yaml": "~2.1"
2674 2678 },
2675 2679 "suggest": {
2676 2680 "symfony/twig-bundle": "~2.1"
... ... @@ -2813,23 +2817,23 @@
2813 2817 "source": {
2814 2818 "type": "git",
2815 2819 "url": "https://github.com/symfony/MonologBundle.git",
2816   - "reference": "v2.3.0"
  2820 + "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a"
2817 2821 },
2818 2822 "dist": {
2819 2823 "type": "zip",
2820   - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/v2.3.0",
2821   - "reference": "v2.3.0",
  2824 + "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/03ed73bc11367b3156cc21f22ac37c7f70fcd10a",
  2825 + "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a",
2822 2826 "shasum": ""
2823 2827 },
2824 2828 "require": {
2825   - "monolog/monolog": ">=1.3,<2.0",
  2829 + "monolog/monolog": "~1.3",
2826 2830 "php": ">=5.3.2",
2827   - "symfony/config": ">=2.2-beta2,<3.0",
2828   - "symfony/dependency-injection": ">=2.2-beta2,<3.0",
2829   - "symfony/monolog-bridge": ">=2.2-beta2,<3.0"
  2831 + "symfony/config": "~2.2-beta2",
  2832 + "symfony/dependency-injection": "~2.2-beta2",
  2833 + "symfony/monolog-bridge": "~2.2-beta2"
2830 2834 },
2831 2835 "require-dev": {
2832   - "symfony/yaml": ">=2.2-beta2,<3.0"
  2836 + "symfony/yaml": "~2.2-beta2"
2833 2837 },
2834 2838 "type": "symfony-bundle",
2835 2839 "extra": {
... ... @@ -3160,7 +3164,7 @@
3160 3164 "role": "Lead Developer"
3161 3165 },
3162 3166 {
3163   - "name": "Armin Ronacher2",
  3167 + "name": "Armin Ronacher",
3164 3168 "email": "armin.ronacher@active-4.com",
3165 3169 "role": "Project Founder"
3166 3170 },
... ...