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
..
tasks	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
acl.test.php	Adding tests to AclShell::view()	2009-08-07 08:37:31 -04:00
api.test.php	Merge branch '1.2' into 1.3	2009-08-03 13:13:18 -07:00
bake.test.php	updating App::import usage. ran each test and everything seems ok.	2009-07-25 18:27:02 -07:00
schema.test.php	Adding tests for SchemaShell::generate() with plugins, testing that plugin schema files do not include non plugin models.	2009-10-08 22:40:17 -04:00
shell.test.php	Fixing test for Shell::err().	2009-09-27 16:25:18 +02:00