cakephp2-php8/cake/libs/controller
Mark Story 08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
..
components Merge branch '1.3' into integration 2010-10-31 21:56:59 -04: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 Adding some documentation about component callbacks. 2010-09-14 23:01:39 -04:00
component_collection.php Adding a reference of the controller to the component collection, so components can easily access the controller in their constructor. 2010-09-14 22:52:51 -04:00
controller.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
pages_controller.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
scaffold.php Changing more php version strings. 2010-10-03 12:46:03 -04:00