Jose Lorenzo Rodriguez 77788a965d Merge remote-tracking branch 'origin/2.0' into 2.0-plugin-loader ... Conflicts: lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_post.php lib/Cake/tests/test_app/plugins/test_plugin/Model/TestPluginPost.php lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php		2011-05-08 22:08:31 -04:30
..
elements	Removing unneeded assignments by reference	2011-04-29 11:49:46 -04:30
emails	Moved the emails templates from elements to views. Renamed the path in layouts to keep the same name. Fixes #1415.	2011-04-20 23:47:21 -04:00
errors	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
Helper	Merge remote-tracking branch 'origin/1.3' into merger	2011-05-04 01:10:23 -04:30
layouts	Moved the emails templates from elements to views. Renamed the path in layouts to keep the same name. Fixes #1415.	2011-04-20 23:47:21 -04:00
pages	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
scaffolds	translation changes in the view folder	2011-03-12 20:02:56 +01:00
Helper.php	Merge remote-tracking branch 'origin/2.0' into 2.0-plugin-loader	2011-05-08 22:08:31 -04:30
HelperCollection.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-02-13 23:10:19 -04:30
MediaView.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-03-10 23:17:54 -04:30
ScaffoldView.php	Fixing ScaffoldView test	2011-02-22 22:47:07 -04:30
ThemeView.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-03-10 23:17:54 -04:30
View.php	Splitting View::element() param $params into $data and $options. Removed param $callbacks, use key 'callbacks' in $options array instead. Closes #1646	2011-04-17 07:00:14 +05:30