cakephp2-php8/cake
Mark Story e0abe99d7d Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/libs/view/helpers/html.php
	cake/tests/cases/libs/folder.test.php
2010-02-28 01:58:29 -05:00
..
config Merge remote branch 'origin/1.2' into 1.2-merger 2010-02-20 01:32:04 -05:00
console Fixing baking views for models in plugins. Making sure that the temporary controller object gets its plugin property set so the correct models are loaded and used. Fixes #381 2010-02-27 20:28:04 -05:00
libs Merge remote branch 'origin/1.2' into 1.2-merger 2010-02-28 01:58:29 -05:00
tests Merge remote branch 'origin/1.2' into 1.2-merger 2010-02-28 01:58:29 -05:00
basics.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
bootstrap.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
dispatcher.php Re-arrange the arguments of triggerCallback. Modifying Dispatcher so its not calling methods on Component directly. Additional methods added to Controller. 2010-02-27 22:01:08 -05:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Fix newline in VERSION.txt 2010-02-24 07:58:33 +11:00