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
..
helpers	Merge branch '1.3' into merger	2010-11-16 21:48:13 -05:00
helper.test.php	Merge branch '1.3' into integration	2010-10-13 22:30:40 -04:00
helper_collection.test.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.test.php	More testing over the MediaView class	2010-10-03 23:30:47 -04:30
theme.test.php	Fixing OpenTest license mentions to use MIT License	2010-10-03 12:31:21 -04:00
view.test.php	Merge branch '2.0' into 2.0-view	2010-11-13 21:03:54 -05:00