Mark Story d88da3d579 Merge branch '1.3' into 2.0 ... Conflicts: cake/libs/configure.php cake/libs/model/connection_manager.php cake/libs/model/model.php cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php cake/tests/cases/libs/view/helpers/text.test.php		2010-09-06 16:53:04 -04:00
..
components	Merge branch '1.3' into 2.0	2010-09-06 16:53:04 -04:00
component.test.php	Starting to update a test that was previously marked incomplete.	2010-08-11 23:08:46 -04:00
component_collection.test.php	Adding 'collectReturn' option to ObjectCollection::trigger. lets a callback collect the return of each object and return that.	2010-08-10 23:18:40 -04:00
controller.test.php	Fixing controller test cases.	2010-08-28 00:29:50 -04:00
controller_merge_vars.test.php	Fixing skips in ControllerMergeVarsTest.	2010-06-24 22:53:48 -04:00
pages_controller.test.php	Added RequestObject output in place of Controller:$output whicch no longer exists.	2010-08-28 15:15:23 +10:00
scaffold.test.php	Fix failing scaffold tests.	2010-08-28 15:01:43 +10:00