mark_story
a5d50da040
Remove dead and unused code.
2014-02-11 16:38:24 -05:00
ADmad
9de3418079
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Permission.php
2014-02-11 18:17:59 +05:30
ADmad
d838e7b56f
Updated upgrade shell to change CakeRequest::onlyAllow() usages.
2014-02-10 18:18:09 +05:30
Mark Story
7a72431442
Merge pull request #2770 from ukk1337/master
...
Added missing 'Session'-Component in bake
2014-02-09 16:04:25 -05:00
Eric Martins
2793dca671
Fix ApiGen errors
2014-02-07 18:29:54 -02:00
mark_story
be8ebfc005
Merge branch 'master' into 2.5
2014-02-05 09:22:46 -05:00
ukk1337
3cd6bb39bd
fixed coding standard errors
2014-02-04 15:37:23 +01:00
ukk1337
60c289fd68
removed indentation
2014-02-04 13:47:50 +01:00
ukk1337
9670a5af88
Added missing 'Session'-Compomnent in bake
...
If a Controller was baked interactively and one want to use Session flash messages, the required 'Session'-Component wasn't added to the $components-Array
2014-02-04 13:35:48 +01:00
mark_story
4d57d3ce5b
Fix plugin path filtering when directories do not exist.
...
When paths do not exist we should correctly remove them from the output
paths.
Fixes #2748
2014-01-30 21:40:08 -05:00
mark_story
c1ab6fa9d1
Merge branch 'master' into 2.5
2014-01-30 10:13:37 -05:00
joostdekeijzer
42daa25340
Fix Console "extract i18n from sources" to handle quotes in Model::validate parameters correctly
2014-01-29 14:53:52 +01:00
ADmad
c093804b35
Merge branch 'master' into 2.5
2014-01-26 17:39:50 +05:30
mark_story
46eda802e5
Fix mising connection parameter to schema objects.
...
When calling create/update the created schema object should be passed
the current connection.
Fixes #2668
2014-01-16 17:19:22 -05:00
mark_story
75dd2ff1fb
Merge branch 'master' into 2.5
2014-01-16 15:20:40 -05:00
pummra
5605ff48ab
Update ControllerTask.php
...
Removed $admin from message in regards to no controllers being baked in all() function
2014-01-08 12:23:03 +00:00
pummra
a981c7fa8c
Removed trailing whitespace.
2014-01-08 10:16:06 +00:00
pummra
0214ac403e
Update ControllerTask.php
...
Updated if statement for clarity and also fixed spelling mistake.
2014-01-08 10:10:40 +00:00
pummra
d41bb0b1b3
Update ControllerTask.php
...
Added an output message if no controllers are baked using the all() function.
2014-01-08 09:52:05 +00:00
euromark
483cd13a26
rename method
2014-01-06 20:00:45 +01:00
euromark
3e48d2e082
Add return early statements for redirecting in controllers.
2014-01-04 13:18:14 +01:00
Ber Clausen
5c08c77b93
Set console options in the same fashion for every shell/task.
2013-12-05 22:59:01 -03:00
mark_story
430ef88118
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-11-25 23:15:15 -05:00
mark_story
eac6d7850f
Remove pointless array cast.
2013-11-23 12:36:15 -05:00
mark_story
311189a662
Sort tables before returning them.
...
This fixes unsorted table lists in the various bake related tasks.
Fixes #2386
2013-11-23 12:34:16 -05:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Marc Würth
19b972cfeb
Implemented skipping of fields for the data validation rules when baking a model
2013-11-13 13:36:19 +01:00
ADmad
d9ca148499
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
mark_story
411f510406
Fix file always being set to 'schema.php'
...
When the name parameter is set and no custom file value is provided,
the name should be used to generate the file name. empty() cannot be
used because the file parameter has a default value of 'schema.php'.
Fixes #2202
2013-10-25 23:36:25 -04:00
euromark
8a90cbd4fe
coding standards
2013-10-24 23:14:09 +02:00
Bryan Crowe
a943ea5c34
Add space between classname(s)
2013-10-22 22:59:50 -04:00
euromark
fca8a01c15
Correct casing of class names.
2013-10-21 22:34:29 +02:00
mark_story
bcafde6212
Add numeric validator for float fields by default.
...
Make bake add numeric validator to float fields.
Fixes #2163
2013-10-20 22:54:30 -04:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Mark Story
04eae1fc24
Merge pull request #1715 from bcrowe/hotfix-docblocks
...
Additional Cake references to CakePHP and docblock typo.
2013-10-10 09:54:14 -07:00
Rick Guyer
a091c630d7
Prevent name param from overwriting file if both are passed
2013-10-09 23:20:25 -05:00
Bryan Crowe
4242bd4f3d
Additional Cake references to CakePHP and docblock typo
2013-10-09 19:38:16 -04:00
Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
wyrihaximus
ac9b7f3882
Refactored the shell reflection portion into a seperate task.
2013-10-02 22:30:12 +02:00
Cees-Jan
5c523a0cd5
Updated the shell given @renansaddam pointers
2013-10-02 22:02:40 +02:00
Cees-Jan
79202ad8a0
Updated doc blocks
2013-10-02 22:02:40 +02:00
Cees-Jan
cdf2b8c40d
Base completion files from @AD7six/cakephp-completion adjusted to be part of the framework
2013-10-02 22:02:40 +02:00
mark_story
cc5795c67d
Merge branch 'master' into 2.5
2013-09-26 10:07:10 -04:00
euromark
0ae69aace9
App::import to App::uses
2013-09-25 19:40:14 +02:00
euromark
653aed7701
is_a() to instance of - completes PR 1669
2013-09-24 22:57:51 +02:00
mark_story
d2577fac60
Merge branch 'master' into 2.5
2013-09-21 20:01:50 -04:00
euromark
58f38f1667
Fix casing of validation rules in bake
2013-09-18 18:31:55 +02:00
Marc Würth
84a669aa7a
Shortened the if clause line length by doing it the @markstory style ;-)
...
Also shortened the line length of some arrays
2013-09-02 20:38:31 +02:00
mark_story
59bb05b433
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04:00
