mark_story 730e373afe Merge branch '1.3' into 2.0 ... Conflicts: cake/libs/cake_session.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/cache/memcache.test.php cake/tests/cases/libs/cake_session.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php cake/tests/fixtures/data_test_fixture.php		2010-09-12 13:35:46 -04:00
..
behaviors	Merge branch '1.3' into 2.0	2010-09-06 16:53:04 -04:00
datasources	Merge branch '1.3' into 2.0	2010-09-12 13:35:46 -04:00
behavior_collection.test.php	Renaming model_behavior test to behavior_collection test as that's the class that contains the tested methods.	2010-09-06 13:51:42 -04:00
cake_schema.test.php	Dont use private attributes as tables in CakeSchema. Fixes #7	2010-08-02 00:22:46 -03:00
connection_manager.test.php	Merge branch '2.0-phpunit' into 2.0	2010-06-28 22:31:35 -04:00
db_acl.test.php	Fixing access violations in DbAcl test case.	2010-06-07 23:47:48 -04:00
model.test.php	Migrating ModelWriteTest to phpunit	2010-06-02 00:30:52 -04:30
model_delete.test.php	Migrating ModelDeleteTest to phpunit	2010-05-31 23:50:03 -04:30
model_integration.test.php	Fixing test case	2010-07-15 23:16:47 -04:30
model_read.test.php	Merge branch '1.3' into 2.0	2010-07-24 22:34:42 -04:00
model_validation.test.php	Merge branch '1.3' into 2.0	2010-09-06 16:53:04 -04:00
model_write.test.php	Adding a cast to fix a failing test from the merge.	2010-09-06 16:54:32 -04:00
models.php	Migrating ModelValidationTest to phpunit	2010-06-01 00:19:11 -04:30