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
..
cache	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
controller	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
model	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
view	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
cache.php	fixing cache error	2009-08-03 11:55:14 -07:00
cake_log.php	Adding docblock for the new variable used for logging. Making the CakeLog::handleError logs the same output as in Debugger::handleError.	2009-09-10 12:32:21 -03:00
cake_session.php	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
cake_socket.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
class_registry.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
configure.php	Fixing typo on variable name.	2009-10-30 18:42:04 -02:00
debugger.php	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
error.php	Making subclassing of ErrorHandler much easier.	2009-10-09 00:13:08 -04:00
file.php	Applying patch from 'Ceeram'. Adds File::copy() and test case. Refs #150	2009-10-08 23:27:31 -04:00
folder.php	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
http_socket.php	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
i18n.php	Replacing $pluginPath loops with App::pluginPath(). Minor optimization for App::pluginPath().	2009-10-16 22:02:06 -04:00
inflector.php	Removing Inflector's inheritance on Object, as it was unecessary.	2009-09-15 21:44:27 -04:00
l10n.php	Fixing catalog() to return 3 char matches	2009-10-30 14:43:52 -05:00
magic_db.php	Merge branch '1.3-misc' into 1.3	2009-08-02 12:20:07 -07:00
multibyte.php	whitespace normalization	2009-08-02 16:10:24 -07:00
object.php	Merge branch '1.2' into 1.3	2009-08-02 13:25:55 -07:00
overloadable.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
overloadable_php4.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
overloadable_php5.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
router.php	Merge branch '1.3-misc' into 1.3	2009-10-02 13:18:12 -04:00
sanitize.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
security.php	whitespace normalization	2009-08-02 16:10:24 -07:00
set.php	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00
string.php	Deprecating String::getInstance()	2009-10-28 18:32:04 -04:00
validation.php	Removing Validation::file() It was never implemented, and file validation can be a lengthy and complicated process. This is better implemented at the application level.	2009-10-31 14:17:24 -04:00
xml.php	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00