José Lorenzo Rodríguez
|
4c0e06c451
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
|
2011-01-02 02:00:03 -04:30 |
|
José Lorenzo Rodríguez
|
b2ad8fe113
|
Removing constant TEST_CAKE_CORE_INCLUDE_PATH
|
2010-12-19 23:33:37 -04:30 |
|
José Lorenzo Rodríguez
|
827a74b734
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
|
2010-12-19 23:12:37 -04:30 |
|
José Lorenzo Rodríguez
|
22581516db
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
lib/Cake/tests/cases/libs/controller/component.test.php
lib/Cake/tests/cases/libs/controller/controller.test.php
lib/Cake/tests/cases/libs/controller/pages_controller.test.php
|
2010-12-18 00:04:44 -04:30 |
|
José Lorenzo Rodríguez
|
f84351dd07
|
More replacements of App::import to App::uses
|
2010-12-09 00:43:11 -04:30 |
|
José Lorenzo Rodríguez
|
4a287faa1e
|
Moving the tests folder
|
2010-12-08 01:36:38 -04:30 |
|