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.3' into 1.3-misc	2009-10-30 22:04:20 -04:00
templates/skel/views/layouts/xml	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
acl.php	Removing ife() from AclShell. Refs #6562	2009-10-21 13:12:03 -04:00
api.php	Removing use of low() from core classes. Refs #6525	2009-10-21 13:03:24 -04:00
bake.php	Fixing wierd workflows in bake when project baking was aborted, it would ask if you wanted to create a database config file for the aborted app.	2009-10-30 22:08:06 -04:00
console.php	Merge branch '1.3-console' into 1.3	2009-09-27 16:26:45 -04:00
i18n.php	Merge branch '1.3-console' into 1.3	2009-09-27 16:26:45 -04:00
schema.php	Updating the help file for schema shell.	2009-10-04 15:12:05 -04:00
shell.php	Adding return to Shell::out() and ShellDispatcher::stdout(). They now return the number of bytes written to stdout. Fixes #164	2009-10-15 00:23:54 -04:00
testsuite.php	Updating all calls to Shell::out().	2009-09-26 23:08:37 +02:00