mark_story 326424592d Merge branch '1.2' into 1.2-merger ... Conflicts: cake/VERSION.txt cake/config/config.php cake/dispatcher.php cake/libs/controller/scaffold.php cake/libs/inflector.php cake/libs/view/view.php cake/tests/cases/libs/controller/scaffold.test.php cake/tests/cases/libs/inflector.test.php cake/tests/cases/libs/view/view.test.php cake/tests/fixtures/counter_cache_post_fixture.php cake/tests/fixtures/counter_cache_user_fixture.php		2009-09-13 13:52:58 -04:00
..
behaviors	Updating model tests to reflect deprecation of Model::bind() and Model::delete() aliases.	2009-08-31 23:40:47 -04:00
datasources	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00
cake_schema.test.php	added unlink to SchemaTest::tearDown()	2009-08-02 16:47:15 -07:00
db_acl.test.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
model.test.php	updating App::import usage. ran each test and everything seems ok.	2009-07-25 18:27:02 -07:00
model_behavior.test.php	Fixing issues with cakeError call.	2009-08-30 19:33:21 -04:00
model_delete.test.php	whitespace normalization	2009-08-02 16:09:39 -07:00
model_integration.test.php	whitespace normalization	2009-08-02 16:09:39 -07:00
model_read.test.php	Changes Model::find() to allow modification of DataSource connection during callbacks.	2009-09-10 09:28:55 -04:00
model_validation.test.php	whitespace normalization	2009-08-02 16:09:39 -07:00
model_write.test.php	Updating model tests to reflect deprecation of Model::bind() and Model::delete() aliases.	2009-08-31 23:40:47 -04:00
models.php	Changes Model::find() to allow modification of DataSource connection during callbacks.	2009-09-10 09:28:55 -04:00