Mark Story d94ff92a9d Merge branch '2.0' into 2.0-request ... Conflicts: cake/libs/view/pages/home.ctp cake/tests/cases/dispatcher.test.php cake/tests/lib/reporter/cake_html_reporter.php		2010-05-02 18:03:23 -04:00
..
elements	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
errors	Converted views, router and security classes to new translation shotcut function use.	2010-04-16 02:20:15 +10:00
helpers	Merge branch '2.0' into 2.0-request	2010-05-02 18:03:23 -04:00
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-05-02 17:53: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	Making Helper extend Object, this fixes issues where Helpers would not have dispatchMethod or requestAction available.	2010-04-23 21:21:31 -04:00
media.php	Merge branch '1.3' into 2.0	2010-05-02 17:53:42 -04:00
theme.php	Fixing memory leak in ThemeView where __paths would grow each time _paths() was called. Fixes #329	2010-02-11 22:57:24 -05:00
view.php	Fixing fatal errors in View test.	2010-04-24 00:22:21 -04:00