mark_story d12c232d8a Merge branch '1.3' into merger ... Conflicts: app/config/core.php cake/console/templates/skel/config/core.php cake/dispatcher.php cake/libs/controller/components/auth.php cake/libs/view/helpers/form.php cake/tests/cases/libs/cake_test_case.test.php cake/tests/cases/libs/controller/components/security.test.php cake/tests/cases/libs/model/models.php cake/tests/cases/libs/router.test.php cake/tests/cases/libs/view/helpers/paginator.test.php cake/tests/lib/cake_test_case.php		2010-11-16 21:48:13 -05:00
..
elements	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
errors	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
helpers	Merge branch '1.3' into merger	2010-11-16 21:48:13 -05:00
layouts	Changing more php version strings.	2010-10-03 12:46:03 -04:00
pages	Merge branch '1.3' into merger	2010-11-16 21:48:13 -05:00
scaffolds	Making default scaffold views html escape contents. Refs #1186	2010-10-24 19:30:22 -04:00
helper.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
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	Removing duplicate calls to Inflector.	2010-11-13 21:08:26 -05:00