mark_story 9b08b725fe Merge branch '2.0' into 2.0-view ... Conflicts: cake/libs/controller/controller.php cake/libs/view/helpers/cache.php		2010-11-13 21:03:54 -05:00
..
helpers	Merge branch '2.0' into 2.0-view	2010-11-13 21:03:54 -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