mark_story e149c411fb Merge branch '1.3' into merger ... Conflicts: cake/VERSION.txt cake/config/config.php cake/console/shells/tasks/template.php cake/dispatcher.php cake/libs/controller/component.php cake/libs/controller/components/email.php cake/libs/controller/scaffold.php cake/libs/model/datasources/dbo/dbo_mysqli.php cake/libs/view/helpers/cache.php cake/libs/view/pages/home.ctp cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php cake/tests/fixtures/datatype_fixture.php		2011-02-05 12:20:09 -05:00
..
behaviors	Merge branch '2.0' into 2.0-pagination	2010-12-24 14:43:11 -05:00
datasources	Merge branch '1.3' into merger	2011-02-05 12:20:09 -05:00
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	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
connection_manager.test.php	Changed the trigger_error by exceptions in ConnectionManager.	2011-01-12 23:08:34 -02:00
db_acl.test.php	Merge branch '1.3' into merger	2011-01-08 23:49:19 -05:00
model.test.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
model_delete.test.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -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	Removed overriding of recursive to 0 in Model::_findNeighbors() if 'recusive' option is not specified in find options. Closes #860	2011-01-30 04:13:01 +05:30
model_validation.test.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
model_write.test.php	Merge branch '1.3' into merger	2011-01-18 20:04:30 -05:00
models.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00