Commit graph

8 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
42b3f993b9 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-01 23:04:52 -04:30
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
8e5bd76752 Fixing several errors when running the testsuite 2010-12-11 01:17:55 -04:30
José Lorenzo Rodríguez
2907765404 Replacing almost all remaining uses of App::import 2010-12-10 01:53:27 -04:30
José Lorenzo Rodríguez
848461f7a0 Making the testsuite run again 2010-12-08 01:49:36 -04:30
José Lorenzo Rodríguez
4c9ad2dec8 Starting the tedious process of moving the testsuite and tests 2010-12-08 00:34:45 -04:30