cakephp2-php8/lib/Cake
Jose Lorenzo Rodriguez febf28f34b Merge remote-tracking branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/templates/default/views/home.ctp
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/media.test.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/test_app/views/pages/home.ctp
	lib/Cake/Cache/Engine/ApcEngine.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/View/Helper/FormHelper.php
2011-07-25 14:44:23 -04:30
..
Cache Merge remote-tracking branch 'origin/1.3' into 2.0 2011-07-25 14:44:23 -04:30
Config Moving default routes into a separate file. 2011-07-22 20:29:45 -04:00
Configure Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Console Merge remote-tracking branch 'origin/1.3' into 2.0 2011-07-25 14:44:23 -04:30
Controller Fixing issue where plugin models in $uses, would create 2011-07-23 14:49:39 -04:00
Core Fixing more failing tests caused by requestAction 2011-07-22 20:29:44 -04:00
Error Updating ExceptionRenderer and CakeErrorHandler for Controller changes. 2011-07-22 20:29:44 -04:00
I18n Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Log Updated the paths from comments. 2011-06-19 20:28:40 -04:00
Model Ensuring uniqueness of method cache keys, all tests passing now 2011-07-17 23:45:22 -04:30
Network Reverting previous change that prevent entry into a special case. 2011-07-22 20:29:44 -04:00
Routing Moving plugin route loading to app/Config/routes.php 2011-07-22 20:29:45 -04:00
Test Merge remote-tracking branch 'origin/1.3' into 2.0 2011-07-25 14:44:23 -04:30
TestSuite Merge remote-tracking branch 'origin/1.3' into 2.0 2011-07-25 14:44:23 -04:30
Utility Merge remote-tracking branch 'origin/1.3' into 2.0 2011-07-25 14:44:23 -04:30
View Merge remote-tracking branch 'origin/1.3' into 2.0 2011-07-25 14:44:23 -04:30
basics.php Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
bootstrap.php Fixing caching of class loading in App class, this was broken after a recent refactoring 2011-07-15 20:44:39 -04:30
LICENSE.txt Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
VERSION.txt Merge branch '1.3' into merger 2011-06-23 12:48:06 -07:00