José Lorenzo Rodríguez
|
d9c99b5ef6
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/tests/cases/libs/controller_test_case.test.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/View/pages/home.ctp
|
2011-01-22 01:00:15 -04:30 |
|
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
|
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
|
e57b3d8e74
|
Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
lib/Cake/View/Helper.php
|
2010-12-10 01:25:00 -04:30 |
|
José Lorenzo Rodríguez
|
b8344ecd33
|
Replacing some of the App::import by App::uses
|
2010-12-08 23:15:18 -04:30 |
|
José Lorenzo Rodríguez
|
4a287faa1e
|
Moving the tests folder
|
2010-12-08 01:36:38 -04:30 |
|