mark_story 6a4e7558fc Merge branch '1.3' into merger ... Conflicts: cake/basics.php cake/console/libs/tasks/extract.php cake/libs/view/helpers/js.php cake/tests/cases/console/libs/tasks/extract.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php cake/tests/test_app/views/pages/extract.ctp lib/Cake/Cache/Engine/MemcacheEngine.php lib/Cake/Model/Behavior/ContainableBehavior.php lib/Cake/Model/Datasource/Database/Mysql.php lib/Cake/Model/Datasource/DboSource.php lib/Cake/Model/Model.php lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php lib/Cake/Test/Case/Model/CakeSchemaTest.php lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php lib/Cake/Test/Case/View/Helper/FormHelperTest.php lib/Cake/Test/Case/View/Helper/TimeHelperTest.php		2011-09-18 12:09:04 -04:00
..
Elements	Removing $error property from DboSource, errors in queries will throw exceptions now	2011-09-03 12:17:00 -04:30
Emails	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
Errors	Adding a new exception renderer method to show useful error for failed queries	2011-09-04 04:50:19 -04:30
Helper	Merge branch '1.3' into merger	2011-09-18 12:09:04 -04:00
Layouts	Removing XmlHelper references in layouts.	2011-08-18 22:11:42 -04:00
Pages	Releasing 2.0.0-RC1	2011-09-04 12:30:53 -04:30
Scaffolds	Deprecating the %page% style placeholders in PaginatorHelper.	2011-09-06 02:37:43 +01:00
Helper.php	Fix entity names for associated model date fields.	2011-09-17 12:29:21 -04:00
HelperCollection.php	Removing trailing spaces.	2011-08-15 23:55:08 -04:00
MediaView.php	Adjusted some types in @param, @return and @var.	2011-07-31 22:57:17 -04:00
ScaffoldView.php	Included @throws in API that was missing.	2011-07-31 16:55:52 -04:00
ThemeView.php	Make full page caching + Themes work.	2011-09-17 13:19:43 -04:00
View.php	Register AppHelper for autoloading	2011-09-07 16:46:59 -04:00