cakephp2-php8/lib/Cake
mark_story 2e8498e166 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
..
Cache Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
Config don't have the version in 2 places 2011-10-28 12:12:28 +02:00
Configure Refactoring PhpReader::read() to check for .php file first. Fixed error when there's a directory with the same name. 2011-10-16 22:21:01 +02:00
Console Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
Controller Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
Core Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
Error Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
I18n Fixing visibility keyword for constructor 2011-12-09 14:08:20 +05:30
Log Added visibility in some methods and attributes. 2011-08-18 22:30:28 -04:00
Model Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
Network Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
Routing Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
Test Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
TestSuite Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
Utility Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
View Merge branch '2.0' into 2.1 2011-12-11 22:51:40 -05:00
basics.php Merge branch '2.0' into 2.1 2011-12-03 13:45:28 -05:00
bootstrap.php Move registration of CakePlugin. 2011-10-23 13:54:13 -04:00
LICENSE.txt Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
VERSION.txt Releasing 2.0.4 2011-11-28 11:20:58 -04:30