mark_story 3ea8c2246a Merge branch '1.3' into merger ... Conflicts: cake/console/cake.php cake/dispatcher.php cake/libs/controller/components/cookie.php cake/libs/view/helper.php cake/libs/view/helpers/ajax.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/model/model_validation.test.php cake/tests/cases/libs/view/helpers/ajax.test.php cake/tests/lib/cake_test_fixture.php		2011-03-01 22:21:44 -05:00
..
behaviors	Updating tests to use new find notation.	2011-02-25 22:04:48 -03:00
datasources	Merge branch '2.0' of github.com:cakephp/cakephp into 2.0	2011-02-24 01:38:11 -04:30
behavior_collection.test.php	Fixed aliasing so it works with plugins in the 'className' key	2011-01-14 17:44:33 -08:00
cake_schema.test.php	Fixing more issues with database prefixes	2011-02-24 01:31:03 -04:30
connection_manager.test.php	Changed the trigger_error by exceptions in ConnectionManager.	2011-01-12 23:08:34 -02:00
db_acl.test.php	Fixing some issues in ACL related classes when using database prefixes	2011-02-23 01:22:23 -04:30
model.test.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
model_delete.test.php	Fixing failing test caused by boolean type changes.	2011-02-12 06:21:19 -05:00
model_integration.test.php	Changes to make mysql cast boolean vaules to the native php boolean datatype	2011-01-01 22:07:27 -04:30
model_read.test.php	Updating tests to use new find notation.	2011-02-25 22:04:48 -03:00
model_validation.test.php	Merge branch '1.3' into merger	2011-03-01 22:21:44 -05:00
model_write.test.php	Updating tests to use new find notation.	2011-02-25 22:04:48 -03:00
models.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00