10 commits

Author	SHA1	Message	Date
mark_story	26769edd04	Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Utility/CakeTime.php lib/Cake/VERSION.txt	2013-08-12 14:39:02 -04:00
Marc Würth	4c13a39f3e	Removed else clauses after redirects and added return before redirect() and flash() calls	2013-08-08 21:10:41 +02:00
Majna	1ce9fc537f	Pages controller should render 404 on missing view file	2013-07-13 17:41:16 +02:00
Marc Würth	4c9f0414cb	Improved the DocBlocks and other code cleanup ... Fixed @license tag, url comes first Whitespace and other minor code cleanup Added some docblocks	2013-05-31 00:11:19 +02:00
Graham Weldon	66d856d883	Added extra line for referencing license file for copyright	2013-02-08 21:22:51 +09:00
Graham Weldon	7b860debe4	This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years. ... I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.	2013-02-08 20:59:49 +09:00
mark_story	94b3839b2e	Fix a few more small issues.	2012-03-18 23:25:19 -04:00
Juan Basso	3b1bd90ad6	Updated copyright to 2012.	2012-03-12 22:46:07 -04:00
mark_story	df5d9ac3d1	Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Model/Model.php lib/Cake/Test/Case/Routing/RouterTest.php	2012-01-20 20:28:15 -05:00
ADmad	f2a58117ca	Moving AppModel, AppController, PagesController out of core to app	2011-11-12 22:30:42 +05:30