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
..
acl.test.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
auth.test.php	Adding test from 'Phally' to expand coverage of allow()	2009-10-15 09:23:24 -04:00
cookie.test.php	Updating test case to reflect API changes.	2009-08-31 22:52:15 -04:00
email.test.php	Changing two deprecated Session::del() calls to Session::delete() in the tests.	2009-10-21 13:00:51 +02:00
request_handler.test.php	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00
security.test.php	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
session.test.php	Updating session component, to not use layout, and use elements instead.	2009-08-31 23:59:40 -04:00