mark_story d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in ... Conflicts: cake/console/libs/shell.php cake/libs/model/connection_manager.php cake/libs/view/helpers/html.php cake/libs/view/helpers/javascript.php cake/tests/cases/libs/i18n.test.php cake/tests/cases/libs/model/connection_manager.test.php cake/tests/cases/libs/model/model_read.test.php cake/tests/cases/libs/view/helpers/html.test.php cake/tests/groups/database.group.php		2009-10-14 00:51:55 -04:00
..
behaviors	Adding patch from 'Ceeram' and 'TehTreag' to implement automatic updating of Aro/Aco nodes created AclBehavior. Test cases added. Fixes #33 and #4261	2009-09-19 01:17:20 -04:00
datasources	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00
cake_schema.test.php	Fixing broken tests in dbo_mysql caused by changes in CakeSchema.	2009-10-04 21:48:20 -04:00
connection_manager.test.php	Refactoring ConnectionManager & tests.	2009-09-25 11:08:34 -04:00
db_acl.test.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
model.test.php	Merge branch '1.2' into 1.2-merger	2009-09-16 01:23:49 -04:00
model_behavior.test.php	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00
model_delete.test.php	Removing deprecated methods from test cases.	2009-09-16 00:33:29 -04:00
model_integration.test.php	whitespace normalization	2009-08-02 16:09:39 -07:00
model_read.test.php	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00
model_validation.test.php	Adding error triggering while in debug mode for unhandled validation methods.	2009-09-30 22:34:29 -04:00
model_write.test.php	Updating model_write.test to not use removed validation constants.	2009-10-13 00:44:28 -04:00
models.php	Merge branch '1.2' into 1.2-merger	2009-09-16 01:23:49 -04:00