mark_story d38857095a Merge branch '1.3' into 2.0 ... Conflicts: cake/libs/model/model.php cake/libs/validation.php cake/libs/view/helpers/ajax.php cake/tests/cases/libs/controller/components/session.test.php		2010-07-24 22:34:42 -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 '1.3' into 2.0	2010-07-24 22:34:42 -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-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	Adding import to Helper so its tests run in CLI.	2010-07-11 20:01:24 -04:00
media.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
theme.php	Adding omitted documentation information.	2010-06-10 14:23:49 -04:00
view.php	Changing Configure::read() to not have a default value, and instead return all values in configure when no param is supplied. Test cases updated. Fixes #503	2010-07-05 21:50:36 -04:00