mark_story 0f2d59d987 Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Network/CakeResponse.php lib/Cake/TestSuite/CakeTestCase.php		2013-08-18 23:10:08 -04:00
..
Behavior	Merge branch 'master' into 2.4	2013-08-18 23:10:08 -04:00
Datasource	Merge branch 'master' into 2.4	2013-08-18 23:10:08 -04:00
Validator	correct return types in doc blocks	2013-07-05 17:19:22 +02:00
AclNode.php	Use inner join instead of a left join.	2013-08-13 13:40:59 -04:00
Aco.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
AcoAction.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Aro.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
BehaviorCollection.php	deprecate Controller::flash() and adjust some other deprecation messages.	2013-08-12 12:51:12 +02:00
CakeSchema.php	Merge branch 'master' into 2.4	2013-06-02 18:03:59 +05:30
ConnectionManager.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
I18nModel.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Model.php	Merge branch 'master' into 2.4	2013-08-18 23:10:08 -04:00
ModelBehavior.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
ModelValidator.php	Fixed bug when using multi model fieldList and whitelists for all models are not provided.	2013-08-03 02:49:41 +05:30
Permission.php	Removed concatenations in gettext $msg param. Closes #3986.	2013-08-15 03:15:35 +04:00