mark_story 2cdb10812d Merge branch '2.0-exceptions' into 2.0 ... Conflicts: cake/dispatcher.php cake/libs/controller/scaffold.php cake/tests/cases/dispatcher.test.php		2010-08-28 00:14:34 -04:00
..
elements	Changing sql_dump element so it only shows if there is no $logs variable set in the view. Overwriting it could adversely effect helper references. Fixes #998	2010-08-10 23:09:27 -04:00
errors	Adding omitted echo.	2010-05-29 00:20:16 -04:00
helpers	Merge branch '2.0-request' into 2.0	2010-08-27 23:31:41 -04:30
layouts	Converted views, router and security classes to new translation shotcut function use.	2010-04-16 02:20:15 +10:00
pages	Merge branch '1.3' into 2.0	2010-07-24 22:34:42 -04:00
scaffolds	Converted views, router and security classes to new translation shotcut function use.	2010-04-16 02:20:15 +10:00
helper.php	Merge branch '2.0-request' into 2.0	2010-08-27 23:31:41 -04:30
helper_collection.php	Fixing broken tests in HelperCollectionTest	2010-08-10 23:18:40 -04:00
media.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
theme.php	Removing ability to register View and ThemeView into ClassRegistry.	2010-08-10 23:18:41 -04:00
view.php	Merge branch '2.0-exceptions' into 2.0	2010-08-28 00:14:34 -04:00