mark_story 730e373afe Merge branch '1.3' into 2.0 ... Conflicts: cake/libs/cake_session.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/cache/memcache.test.php cake/tests/cases/libs/cake_session.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php cake/tests/fixtures/data_test_fixture.php		2010-09-12 13:35:46 -04:00
..
elements	Merge branch '2.0-exceptions' into 2.0	2010-09-10 20:31:16 -04:00
errors	Adding stack traces to error400 and error500 when debug > 0.	2010-09-06 18:09:11 -04:00
helpers	Merge branch '1.3' into 2.0	2010-09-06 16:53:04 -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-09-12 13:35:46 -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 '1.3' into 2.0	2010-09-06 16:53:04 -04:00
helper_collection.php	Updating the various CakeExceptions to take arrays in their constructors. This allows for the existing templates to continue working, as well as generalize the way in which errors are handled. This change also makes the messages coming out of exceptions more readable and removes string hackery.	2010-08-29 21:37:25 -04:00
media.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
theme.php	Fixing + adding imports for Scaffold.	2010-09-08 00:11:37 -04:00
view.php	Updating the various CakeExceptions to take arrays in their constructors. This allows for the existing templates to continue working, as well as generalize the way in which errors are handled. This change also makes the messages coming out of exceptions more readable and removes string hackery.	2010-08-29 21:37:25 -04:00