mark_story b9f0fc0724 Merge branch '1.3' into merger ... Conflicts: cake/dispatcher.php cake/libs/cake_session.php cake/libs/controller/components/cookie.php cake/libs/controller/components/email.php cake/libs/controller/controller.php cake/libs/controller/scaffold.php cake/libs/set.php cake/libs/validation.php cake/libs/view/view.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/controller/components/security.test.php cake/tests/cases/libs/controller/controller.test.php cake/tests/cases/libs/validation.test.php cake/tests/cases/libs/view/view.test.php		2010-12-10 22:24:31 -05:00
..
elements	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
errors	Replaced the *printf with i18n aliases by i18n aliases with params.	2010-12-04 23:37:13 -02:00
helpers	Merge branch '1.3' into merger	2010-12-10 22:24:31 -05:00
layouts	Changing more php version strings.	2010-10-03 12:46:03 -04:00
pages	Merge branch '2.0-config' into 2.0	2010-12-05 23:00:05 -05:00
scaffolds	Replaced the *printf with i18n aliases by i18n aliases with params.	2010-12-04 23:37:13 -02:00
helper.php	Making the format attribute customizable in helpers.	2010-12-10 02:42:38 -02:00
helper_collection.php	Removing the enable parameter on HelperCollection, BehaviorCollection, and ComponentCollection. They all now support the enabled option that Behaviors have historically supported. This provides a simpler API with fewer arguments, and allows callbacks to be disabled on objects in their declared arrays.	2010-11-07 13:23:45 -05:00
media.php	Cleaning up the MediaView class	2010-10-03 23:27:22 -04:30
scaffold.php	Pulling ScaffoldView into a separate file.	2010-11-12 22:54:28 -05:00
theme.php	Removing reference operators in view class constructors.	2010-11-12 22:51:53 -05:00
view.php	Changing View::element() to not overwrite viewVars with helpers that	2010-12-09 22:06:23 -05:00