mark_story 705e90bef7 Merge branch '1.3' into 2.0-merge ... Conflicts: cake/libs/cache/memcache.php cake/libs/cake_session.php cake/libs/model/behaviors/acl.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/cake_test_fixture.test.php cake/tests/cases/libs/model/behaviors/acl.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php		2010-08-15 23:09:02 -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	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-merge	2010-08-15 23:09:02 -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