Mark Story 6a3347ef7c Merge remote branch 'origin/1.2' into 1.2-merger ... Conflicts: cake/VERSION.txt cake/config/config.php cake/console/libs/tasks/model.php cake/dispatcher.php cake/libs/l10n.php cake/libs/model/datasources/dbo_source.php cake/libs/view/pages/home.ctp cake/tests/cases/console/libs/tasks/model.test.php cake/tests/cases/libs/view/helpers/ajax.test.php cake/tests/cases/libs/view/helpers/text.test.php		2010-02-20 01:32:04 -05:00
..
behaviors	Adding return statement, preventing infinite loops when no default fields are bound, and unbindTranslation() is called with no fields. Fixes #307	2010-02-11 22:03:43 -05:00
datasources	Merge remote branch 'origin/1.2' into 1.2-merger	2010-02-20 01:32:04 -05:00
cake_schema.test.php	Not forcing the use of ds, so will use $useDbConfig instead, tests added. Fixes #324.	2010-02-15 14:46:18 -03:00
connection_manager.test.php	Adding patches, and tests from tkykmw. Add support for plugin datasource drivers. Fixes #297	2010-02-16 22:35:16 -05:00
db_acl.test.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
model.test.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
model_behavior.test.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
model_delete.test.php	Adding tests for deletion of multiple habtm associations. Reverting changes made in [15518b8c9a] that caused incorrect removal of links when deleting records. Fixes #247	2010-01-29 11:55:18 -05:00
model_integration.test.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
model_read.test.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
model_validation.test.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
model_write.test.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
models.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00