cakephp2-php8/lib/Cake/Controller
Jose Lorenzo Rodriguez 000e05b468 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/libs/view/helpers/js.php
	cake/tests/lib/templates/missing_conenction.php
	cake/tests/lib/templates/missing_connection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/templates/missing_conenction.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
..
Component Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
AppController.php Fixing SessionComponent tests 2011-01-28 02:00:20 -04:30
CakeErrorController.php Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-10 23:17:54 -04:30
Component.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
ComponentCollection.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
Controller.php Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-09 12:58:49 -04:30
PagesController.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
Scaffold.php translation changes in the controller ditranslation changes in the 2011-03-12 19:59:40 +01:00