mark_story 3237402fb8 Merge branch '1.3' into merger ... Conflicts: cake/libs/configure.php		2010-11-20 23:14:33 -05:00
..
components	Merge branch '1.3' into merger	2010-11-16 21:48:13 -05:00
app_controller.php	Changing more php version strings.	2010-10-03 12:46:03 -04:00
cake_error_controller.php	Adding stack trace output to the framework errors.	2010-09-06 17:54:48 -04:00
component.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
component_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
controller.php	Merge branch '1.3' into merger	2010-11-20 23:14:33 -05:00
pages_controller.php	Changing more php version strings.	2010-10-03 12:46:03 -04:00
scaffold.php	Pulling ScaffoldView into a separate file.	2010-11-12 22:54:28 -05:00