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 |
|
euromark
|
dab0c5e753
|
Allow behaviors to be added to bake templates and improve doc blocks
|
2013-03-15 12:14:06 +01:00 |
|
euromark
|
111366d5c8
|
== to === and != to !== where applicable
|
2013-02-12 03:38:08 +01: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 |
|
euromark
|
e1357ca8aa
|
indentation in templates
|
2012-07-18 03:24:55 +02:00 |
|
AD7six
|
39a53fe0e2
|
updating model bake tempalte to meet code standards
|
2012-05-10 00:44:03 +02:00 |
|
AD7six
|
d1f522e53a
|
attempt to get baked code output closer to phpcs standard
|
2012-05-09 23:38:29 +02:00 |
|
Juan Basso
|
c754fb2dcb
|
Updated copyright to 2012.
|
2012-03-12 22:46:46 -04:00 |
|
Rachman Chavik
|
90af608489
|
keep existing data in unique HABTM closes LH 275
ported to 2.0 branch from cakephp/cakephp#93
|
2011-12-12 18:09:02 +07:00 |
|
Renan Gonçalves
|
507eb2f653
|
Fixing @package at in Cake/Console/Templates files.
|
2011-10-15 20:26:48 +02:00 |
|
mark_story
|
7c08c966b0
|
Adding App::uses() call to model baking.
Models should always include their parent classes to be safe.
Bake should reflect the best practice.
Refs #1971
|
2011-09-09 20:43:04 -04:00 |
|
Juan Basso
|
d84531d29c
|
Using @property to autocomplete components and helpers in some IDEs. Also added @property to bake of controller and model. Fixes #103.
|
2011-07-31 20:28:35 -04:00 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Juan Basso
|
21348169fa
|
Camelized templates folder.
|
2011-05-30 23:02:39 -04:00 |
|