Mark Story
bed60b5d82
Merge pull request #1312 from ravage84/package-fixes
...
Fixed or removed some package/subpackage definitions to reflect director...
2013-05-29 10:14:00 -07:00
Mark Story
f6b53025f0
Merge pull request #1310 from Jippi/hotfix/allow-bake-tasks-to-provide-theme-as-cli-option
...
allow bake tasks to provide theme as cli option
2013-05-29 10:13:28 -07:00
ADmad
2a8d3c3e03
Merge pull request #1311 from ravage84/patch-4
...
Fixed package name in docblock
2013-05-29 07:24:58 -07:00
Marc Würth
e7eb09bc23
Renamed ...Controller package to ...View
...
Probably a leftover from splitting in 09e7f1d491
2013-05-29 17:20:41 +03:00
Christian Winther
2eb9841c54
Add short option for theme in BakeShell
2013-05-29 13:49:51 +00:00
Christian Winther
5aac41ed43
Fix indentation and add short option 't' for template
2013-05-29 13:49:12 +00:00
Christian Winther
ae3d9a7a8e
Remove ` from help line
2013-05-29 13:46:13 +00:00
Christian Winther
2fca41c35d
Enable the user to provide a CLI theme through the --theme option for all bake tasks
2013-05-29 13:41:57 +00:00
Marc Würth
29cc6b3652
Fixed or removed some package/subpackage definitions to reflect directory structure
...
Lowercase cake instead of Cake
Tests instead of Test
Fixtures instead of Fixture
2013-05-29 15:00:18 +02:00
ADmad
5c38b7e66c
Merge pull request #1309 from damien-biasotto/patch-1
...
Fix typo variable name in _deleteDependent().
2013-05-29 04:42:27 -07:00
Damien Biasotto
e1c27af9e9
Fix typo variable name in _deleteDependent().
...
It's not a big deal but there was a typo in _deleteDependent() method.
$savedAssociatons instead of $savedAssociations.
2013-05-29 14:25:39 +03:00
mark_story
cce9e84907
Merge branch 'master' into 2.4
2013-05-28 22:40:32 -04:00
mark_story
06cf62aefe
Fix failing tests.
...
Refs GH-1307
2013-05-28 22:38:01 -04:00
Mark Story
aa9f221254
Merge pull request #1307 from Jippi/hotfix/debug-in-cli-should-include-newline
...
debug() in CLI should include newline..
2013-05-28 19:31:41 -07:00
Mark Story
b111750494
Merge pull request #1308 from Jippi/hotfix/sql-bug-with-not-in-with-one-key
...
Hotfix/sql bug with NOT in with one key
2013-05-28 10:21:21 -07:00
Ceeram
49aded5399
fix coding standard error
2013-05-28 18:39:38 +02:00
Mark Story
05f58a700c
Merge pull request #1306 from Jippi/hotfix/notice-should-be-styled-too
...
Adding color output for notice / LOG_NOTICE in ConsoleOutput
2013-05-28 09:07:34 -07:00
Christian Winther
ef8603e1a7
Add unit test
2013-05-28 12:02:58 +00:00
Christian Winther
4752fcd713
Adding color output for notice / LOG_NOTICE in ConsoleOutput
2013-05-28 11:59:37 +00:00
Christian Winther
d14f0cece4
debug() in CLI should include newline..
...
If not, two debug() statements after each other is very hard to read, as the #### separater is on the same line
2013-05-28 11:57:59 +00:00
Christian Winther
9e6120c86a
This fixes an issue where attempting to use "!=" in a condition with an array with only a single element generates invalid SQL.
...
Example:
$condition['Model.id !='] = array(1, 2); //Generates Model.id NOT IN (1, 2) as expected
$condition['Model.id !='] = array(1); //Generates Model.id != = (1) which is invalid SQL
Patch will cause the above to generate Model.id != (1);
This an implimentation of @markstory's suggestion on PR 1232
2013-05-28 11:54:31 +00:00
euromark
bebb8ec416
do not translate error message in test case
2013-05-28 03:25:52 +02:00
mark_story
7334643b55
Fix issues with getting Xml as SimpleXmlElement and invalid Xml.
...
Fixes #3855
2013-05-27 13:22:14 -04:00
mark_story
41e0c524f2
Only try to use CakeErrorController if AppController exists.
...
This fixes missing error pages when there are parse errors in
AppController.
Fixes #3850
2013-05-26 22:11:53 -04:00
ADmad
00f972f033
Deprecated AuthComponent::password()
2013-05-27 00:25:42 +05:30
ADmad
56fa0dccda
Remove unnecessary overriding of '_findUser()' in 'DigestAuthenticate'.
2013-05-26 12:31:40 +05:30
ADmad
7d06f7b304
Merge pull request #1275 from ADmad/2.4-auth-hashtype
...
Added password hasher
2013-05-25 23:59:30 -07:00
ADmad
dd2892ad8d
Added password hasher
2013-05-26 11:29:06 +05:30
ADmad
36c592e72e
Merge branch 'master' into 2.4
2013-05-26 11:23:53 +05:30
Mark Story
76f4d10d13
Merge pull request #1301 from tersmitten/extracttask-output-directory-bugfix
...
Fix for ExtractTask does not check output directory
Fixes #3852
2013-05-25 18:34:50 -07:00
Mischa ter Smitten
c0039f642e
Output to stderr, not stdout
2013-05-25 23:19:31 +02:00
Mischa ter Smitten
caec0abcfc
Fix for ExtractTask does not check output directory (ticket 3852)
2013-05-25 22:32:07 +02:00
mark_story
9ee610757e
Throw exceptions when invalid permission keys are used.
...
Silently 'failing' to save permissions is bad, throw exceptions instead.
Fixes #3851
2013-05-24 21:47:22 -04:00
Rachman Chavik
a63b54c34b
Fix: Incorrect model being used as Controller::$modelClass
...
We cannot be sure that Controller::$uses have not been iterated, so
reset the array to use the first value.
2013-05-24 17:50:43 +07:00
euromark
75b5a323e4
enforce a better email wrapping to send valid emails
2013-05-23 18:34:39 +02:00
mark_story
ca1f9e800e
Make CakeEmail::config() merge configuration.
...
This allows you to incremementally overwrite configuration and better
matches other config methods in CakePHP.
Fixes #3848
2013-05-23 09:47:24 -04:00
mark_story
85a906c0fc
Expand doc blocks.
2013-05-23 09:45:50 -04:00
ADmad
11e428bca3
Fix docblock
2013-05-23 01:02:07 +05:30
Mark Story
074b21591c
Merge pull request #1294 from ADmad/2.3-bugfix-smtp
...
Ensure passing empty array to SmtpTransport::config() does not reset exi...
2013-05-22 06:21:07 -07:00
Mark Story
085ebae1d3
Merge pull request #1295 from cakephp/master-i18n-fixes
...
Master i18n fixes
2013-05-22 06:20:04 -07:00
euromark
fa02a2efc9
unify "Are you sure you want to delete"
2013-05-22 12:15:33 +02:00
euromark
e3e11a48e6
fix some domain translations and remove leftover true param from 1.x
2013-05-22 11:15:01 +02:00
ADmad
eccdf3bf60
Ensure passing empty array to SmtpTransport::config() does not reset existing config.
...
Synced args and return value with AbstractTransport::config().
Fixes #3840
2013-05-22 11:36:31 +05:30
Mark Story
1357b00843
Merge pull request #1289 from gilleswittenberg/master
...
Allow setting type attribute on script block tags
2013-05-21 13:27:35 -07:00
mark_story
408aac4798
Update return types.
2013-05-21 15:45:22 -04:00
Gilles Wittenberg
6d996d52ce
Allow setting different type on scriptStart + scriptEnd
2013-05-21 20:14:44 +02:00
Gilles Wittenberg
f19615a3be
Allow setting different type on scriptBlock
2013-05-21 20:14:44 +02:00
Mark Story
28a3b73bdc
Merge pull request #1292 from openam/HtmlHelper
...
make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false
2013-05-21 08:44:08 -07:00
Mark Story
e2304d8fd6
Merge pull request #1293 from kunit/2.3-cakeemail-wrap
...
Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST
2013-05-20 19:24:41 -07:00
mark_story
82d57fb8b2
Add mocked components to the enable list of components.
...
Mocked components should be enabled so they receive callbacks. This
allows more realistic integration tests using testAction(). Stop
disabling the constructor as it causes a number of errors with
components that use components.
Fixes #3842
2013-05-20 22:22:22 -04:00