cakephp2-php8/cake/tests/cases/libs/controller
mark_story a3bb77c4f3 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/acl.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/model.php
	cake/console/libs/templates/skel/views/layouts/xml/default.ctp
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/validation.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
..
components Merge branch '1.2' into 1.3-merger 2009-11-01 12:11:49 -05:00
component.test.php Merge branch '1.2' into 1.3-merger 2009-11-01 12:11:49 -05:00
controller.test.php Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-10-03 11:44:26 -04:00
controller_merge_vars.test.php Merge branch '1.2' into 1.3-merger 2009-11-01 12:11:49 -05:00
pages_controller.test.php updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
scaffold.test.php Updating Scaffold to work with any single prefix. You can set $scaffold = to any prefix defined in Routing.prefixes. 2009-10-31 16:06:20 -04:00