mark_story f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 ... differences upon merging. Conflicts: app/config/core.php cake/console/templates/skel/config/core.php cake/libs/cache/file.php cake/libs/cake_session.php cake/libs/controller/components/email.php cake/libs/i18n.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/cache/memcache.test.php cake/tests/cases/libs/model/model_write.test.php		2010-09-24 23:27:22 -04:00
..
components	Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0	2010-09-24 23:27:22 -04:00
app_controller.php	Numerous 'shoer description' documentation entries updated to contain useful comments.	2010-05-30 01:20:28 +10:00
cake_error_controller.php	Adding stack trace output to the framework errors.	2010-09-06 17:54:48 -04:00
component.php	Adding some documentation about component callbacks.	2010-09-14 23:01:39 -04:00
component_collection.php	Adding a reference of the controller to the component collection, so components can easily access the controller in their constructor.	2010-09-14 22:52:51 -04:00
controller.php	Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0	2010-09-24 23:27:22 -04:00
pages_controller.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
scaffold.php	Fixing + adding imports for Scaffold.	2010-09-08 00:11:37 -04:00