mark_story e0aab77dab Merge branch 'master' into 2.3 ... Conflicts: app/Config/Schema/i18n.php lib/Cake/I18n/Multibyte.php lib/Cake/Test/Case/Log/CakeLogTest.php lib/Cake/Test/Case/Routing/DispatcherTest.php		2012-11-10 21:33:26 -05:00
..
Config	Hidden divs created by FormHelper can now be customized.	2012-09-04 23:56:30 +05:30
Console	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
Controller	Helpers in custom CakeErrorController are lost	2012-06-01 15:28:06 +07:00
Error	move charset/App.encoding into CakeResponse	2012-09-27 20:28:19 +02:00
Lib	new base class Log/Engine/BaseLog	2012-05-11 12:37:00 +07:00
Locale	Implemented translation of validation rule arguments in validation error messages. Closes #2816	2012-04-22 23:25:07 +05:30
Model	Fix STRICT warnings on PHP 5.4	2012-08-21 13:08:43 +02:00
Plugin	Merge branch 'master' into 2.3	2012-11-10 21:33:26 -05:00
tmp	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Utility	adding tests for engine overrides	2012-02-14 23:28:57 +07:00
Vendor	Fix code style errors.	2012-10-09 13:20:53 -04:00
View	cleanup	2012-10-27 00:26:54 +02:00
webroot	Fix code style errors.	2012-10-09 13:20:53 -04:00