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
..
config	Add support libs folder into app and plugins that will allow to split users and vendors code. Libs files should follow cake naming conventions for files names and classes.	2009-10-21 14:59:12 +04:00
console	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
libs	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
tests	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
basics.php	Removing use of low() from core classes. Refs #6525	2009-10-21 13:03:24 -04:00
bootstrap.php	Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit.	2009-08-01 08:36:57 -04:00
dispatcher.php	Updating $pluginPath loops to use App::pluginPath().	2009-10-16 22:02:06 -04:00
LICENSE.txt	closes #5271, removing root docs directory. adding README	2008-12-25 18:05:56 +00:00
VERSION.txt	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00