cakephp2-php8/lib/Cake
mark_story 051d78c1a5 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/Model/Model.php
2014-07-16 23:11:58 -04:00
..
Cache Merge branch 'master' into 2.6 2014-07-03 11:13:06 -04:00
Config Updated the default Cake routes to include a defaultRoute true flag to allow differentiation 2014-05-29 00:55:51 -04:00
Configure Correct doc blocks according to cs guidelines. 2014-07-03 15:36:42 +02:00
Console Merge branch 'master' into 2.6 2014-07-03 11:13:06 -04:00
Controller Correct pattern matching. 2014-07-06 09:42:20 -04:00
Core Merge branch 'master' into 2.6 2014-07-03 11:13:06 -04:00
Error Fix an infinite recursion caused by missing plugin 2014-07-09 15:55:41 +09:00
Event Correct doc blocks according to cs guidelines. 2014-07-03 15:36:42 +02:00
I18n Merge branch 'master' into 2.6 2014-07-03 11:13:06 -04:00
Log Correct doc blocks according to cs guidelines. 2014-07-03 15:36:42 +02:00
Model Merge branch 'master' into 2.6 2014-07-16 23:11:58 -04:00
Network Merge branch 'master' into 2.6 2014-07-09 10:17:05 -04:00
Routing Correct doc blocks according to cs guidelines. 2014-07-03 15:36:42 +02:00
Test Merge branch 'master' into 2.6 2014-07-16 23:11:58 -04:00
TestSuite Make the error message better for fixture errors 2014-07-15 13:21:48 +01:00
Utility Merge branch 'master' into 2.6 2014-07-09 10:17:05 -04:00
View Deprecate $confirmMessage argument. 2014-07-10 23:31:51 +05:30
basics.php Merge branch 'master' into 2.6 2014-07-10 14:39:32 -04:00
bootstrap.php Correct doc blocks according to cs guidelines. 2014-07-03 15:36:42 +02:00
LICENSE.txt Formatted CSF address 2013-02-08 21:08:15 +09:00
VERSION.txt Update version number to 2.5.2 2014-06-14 21:36:39 -04:00