cakephp2-php8/cake/libs/controller/components
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
..
acl.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
auth.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
cookie.php Changing more php version strings. 2010-10-03 12:46:03 -04:00
email.php Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
request_handler.php Testing the build of XML. If it is invalid will generate a Exception. 2010-10-24 22:42:05 -02:00
security.php Making the ability to use longer shared csrf tokens possible. This should make for fewer blackholed' requests when doing complicated javascript. 2010-10-24 20:26:31 -04:00
session.php Changing more php version strings. 2010-10-03 12:46:03 -04:00