ADmad
|
3303a2cda1
|
Merge branch 'master' into 2.4
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
|
2013-06-02 18:03:59 +05:30 |
|
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 |
|
ADmad
|
13029cc2bc
|
Merge branch 'master' into 2.4
|
2013-02-09 02:20:16 +05:30 |
|
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 |
|
Rik van der Heijden
|
e331ae64ee
|
Fix CrudAuthorizeTest, added Router::reload() in setUp
|
2013-01-29 21:35:29 +01:00 |
|
Majna
|
6d75d90c25
|
Code cleanup
Remove unneeded sprintf.
Fix doc blocks.
Remove duplicated keys in tests assertions.
Use boolean value for CakeRequest $parseEnvironment param.
|
2012-12-28 23:37:58 +01:00 |
|
mark_story
|
72c3059d94
|
Add missing parent calls.
Fixes piles of failing tests.
|
2012-04-15 22:20:34 -04:00 |
|
Juan Basso
|
c754fb2dcb
|
Updated copyright to 2012.
|
2012-03-12 22:46:46 -04:00 |
|
mark_story
|
edb582944c
|
Fix coding standards in Test/Case/Controller
|
2012-03-11 22:20:25 -04:00 |
|
mark_story
|
d68053c4d4
|
Fix exception expectations.
PHPUnit 3.6 does not allow you to expect the generic Exception
class.
|
2011-11-04 22:54:08 -04:00 |
|
Gun.io Whitespace Robot
|
4742168253
|
Remove whitespace [Gun.io WhitespaceBot]
|
2011-10-28 18:25:08 -04:00 |
|
Majna
|
8c3f64be52
|
Fixing doc blocks in Test suite and some visibility keywords.
|
2011-10-10 23:18:48 +02:00 |
|
mark_story
|
a5fe702624
|
Updating CrudAuthorize to work like ActionsAuthorize.
Updating tests.
Fixes #1749
|
2011-09-26 20:38:38 -04:00 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Juan Basso
|
192812ee7f
|
Updating the copyright to 2011.
|
2011-05-30 22:32:43 -04:00 |
|
Renan Gonçalves
|
438050dcaa
|
Adding 'public' visibility to all public methods.
|
2011-05-30 22:02:32 +02:00 |
|
Jose Lorenzo Rodriguez
|
900dfef2f7
|
Starting unification of casing in remaining folders
|
2011-05-13 01:53:49 -04:30 |
|