mark_story 2afb05b590 Merge branch '2.0' into 2.1 ... Conflicts: app/View/Pages/home.ctp lib/Cake/Config/config.php lib/Cake/Core/App.php lib/Cake/VERSION.txt lib/Cake/View/Helper/NumberHelper.php		2012-02-12 10:06:13 -05:00
..
Elements	Fix whitespace.	2012-02-09 20:00:25 -05:00
Emails	Fixing @package tag in Cake/View files.	2011-10-15 20:17:44 +02:00
Errors	Display datasource name in exceptions and error page.	2011-11-17 11:24:45 +07:00
Helper	Merge branch '2.0' into 2.1	2012-02-12 10:06:13 -05:00
Layouts	Update default layouts to use blocks.	2011-12-17 22:23:37 -05:00
Scaffolds	Fixes the MethodNotAllowed when deleting a model from an scaffolding view.ctp page	2012-01-16 16:21:06 +01:00
Helper.php	$options param in Helper::assetUrl() now defaults to empty array.	2012-02-10 19:05:15 +05:30
HelperCollection.php	Making the CakeEvent -> ObjectCollection bridge more intelligent, adding tests	2011-12-25 23:17:08 -04:30
JsonView.php	Ensure helpers are loaded in data views.	2012-01-11 20:21:56 -05:00
MediaView.php	Merge branch '2.0' into 2.1	2012-02-12 10:06:13 -05:00
ScaffoldView.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00
ThemeView.php	Merge branch '2.0' into 2.1	2012-01-26 21:40:18 +01:00
View.php	Added Plugin.asset support for HtmlHelper css(), script(), and image() with tests	2012-02-07 20:20:50 -08:00
ViewBlock.php	Fix issue with rendering elements inside blocks.	2011-12-30 14:56:31 -05:00
XmlView.php	Ensure helpers are loaded in data views.	2012-01-11 20:21:56 -05:00