mark_story
debdc6bccc
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
2014-04-07 21:46:11 -04:00
mark_story
ac66c2c03a
Merge branch 'master' into 2.5
2014-04-07 21:45:57 -04:00
Mark Story
bb7b450404
Merge pull request #3260 from dereuromark/2.5-count-dim
...
Without any params this method does not make sense
2014-04-07 21:45:31 -04:00
Mark Story
caf0217fe0
Merge pull request #3259 from dereuromark/2.5-array-merge
...
microptimize options and default merge and other string key array merges
2014-04-07 21:44:38 -04:00
mark_story
b05ab740d6
Merge branch '2.5-AssetDispatcher-404' into 2.5
...
Return a 404 much earlier when handling missing theme/plugin assets.
Fixes #2750
2014-04-07 21:43:37 -04:00
euromark
fdc42a24ca
Without any params this method does not make sense
2014-04-08 03:27:45 +02:00
mark_story
513f7bfe86
Cleanup file header.
2014-04-07 21:26:35 -04:00
mark_story
7eb569c439
Add test case for #2750
2014-04-07 21:26:11 -04:00
euromark
a7744e6ff4
a few more corrections
2014-04-08 01:49:33 +02:00
euromark
0ece694a75
microptimize options and default merge and other string key array merges
2014-04-08 01:25:14 +02:00
Mark Story
8d47ef43e5
Merge pull request #3250 from dereuromark/2.5-hash
...
Use Hash instead of Set class
2014-04-06 21:52:25 -04:00
mark_story
3a28041b8f
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
2014-04-06 21:27:00 -04:00
mark_story
66bfce4062
Merge branch 'moberemk/patch-2' into 2.5
...
Make HtmlHelper::addCrumb() chainable.
Refs #3002
2014-04-06 21:25:57 -04:00
euromark
ad5e62515f
Use Hash instead of Set class
2014-04-07 03:23:51 +02:00
Mark Oberemk
e3a0795bed
Update HtmlHelper.php
...
Updated documentation to include the chained $this return
2014-04-06 21:23:42 -04:00
Mark Oberemk
d5721f10fd
Allow chaining in the addCrumb method
...
For convenience I think it might be valuable to allow addCrumb (and possibly other similar functions) to return $this to permit chained calls such as this:
$this->Html->addCrumb('Admin', '/admin')->addCrumb('Blogs', '/admin/users')->addCrumb('Add');
as opposed to the considerably more verbose version that needs to be used now:
$this->Html->addCrumb('Admin', '/admin');
$this->Html->addCrumb('Blogs', '/admin/users');
$this->Html->addCrumb('Add');
I'm not sure if this violates some API conventions for helpers but it does seem rather more convenient to work with to me.
2014-04-06 21:23:42 -04:00
José Lorenzo Rodríguez
7c3390b0d7
Merge pull request #3248 from dereuromark/2.5-validation
...
2.5 validation method chaining
2014-04-06 23:02:10 +02:00
euromark
cb0ac6f9f3
Add a note to offsetSet() on why it cannot chain.
2014-04-06 22:59:18 +02:00
José Lorenzo Rodríguez
37aee6a40b
Merge pull request #3247 from cakephp/master-docblocks
...
Correct doc blocks
2014-04-06 22:31:40 +02:00
euromark
6f53529520
Correct doc blocks
2014-04-06 22:27:51 +02:00
José Lorenzo Rodríguez
2dd57c7191
Merge pull request #3246 from cakephp/2.5-event
...
Make dispatch return CakeEvent - resolves #2819
2014-04-06 21:51:48 +02:00
Jose Lorenzo Rodriguez
925db9e25e
Revert "Revert "Merge pull request #3002 from moberemk/patch-2""
...
This reverts commit 0d80c92ffb
2014-04-06 21:51:03 +02:00
Jose Lorenzo Rodriguez
343d3279b9
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
Jose Lorenzo Rodriguez
0d80c92ffb
Revert "Merge pull request #3002 from moberemk/patch-2"
...
This reverts commit 8e3d6cffb792800889a6
2014-04-06 21:48:59 +02:00
euromark
5d4bb9c2e0
Make dispatch return CakeEvent - resolves #2819
2014-04-06 21:17:51 +02:00
José Lorenzo Rodríguez
8e3d6cffb7
Merge pull request #3002 from moberemk/patch-2
...
Allow chaining in the addCrumb method
2014-04-06 21:09:10 +02:00
mark_story
92800889a6
Update version number to 2.4.7
2014-04-04 22:25:48 -04:00
mark_story
7fb920c256
Add file missed in last commit.
2014-04-04 22:22:38 -04:00
mark_story
4ec81542db
Fix email rendering when using 2 different plugins.
...
When an email template and layout are in different plugins the incorrect
plugin would be used for the layout.
Fixes #3062
2014-04-04 21:45:04 -04:00
mark_story
b8e21c99ee
Only count _id if it is the last 3 characters in the field name.
...
This prevents issues when baking models for tables containing `_id`.
Fixes #3230
2014-04-04 21:26:31 -04:00
Mark Story
c92769c980
Merge pull request #3224 from dereuromark/master-deprecations
...
correct deprecation notices
2014-04-04 14:04:53 -04:00
euromark
854a53b3cb
generalize sentence
2014-04-04 19:19:10 +02:00
euromark
823909603a
correct deprecation notices
2014-04-04 19:18:02 +02:00
Saleh Souzanchi
40b7694891
adding options for react to response when asset not exists
2014-04-04 19:50:37 +04:30
Ceeram
5c31641ea8
Change argument type to mixed in docblock, as debug() and pr() accept not just a single type
2014-04-02 23:53:54 +02:00
Joseph Woodruff
8536371501
Sqlserver Datasource how properly appends the schemaName prefix in the describe() method
2014-04-02 13:59:04 -06:00
Joseph Woodruff
d526fdadc1
Base model class no longer changes an already defined schemaName value
2014-04-02 13:58:29 -06:00
José Lorenzo Rodríguez
bf28e69501
Merge pull request #3197 from dereuromark/master-cs
...
cs
2014-04-02 08:32:26 +02:00
euromark
b150e33472
correct missed cs errors
2014-04-02 03:16:03 +02:00
euromark
e544340d67
fix indentation
2014-04-02 03:12:22 +02:00
euromark
bbe3b6a439
more cs
2014-04-02 03:09:42 +02:00
euromark
0d09a54033
more missing doc block tags added
2014-04-02 03:02:37 +02:00
euromark
44952b06a4
cs
2014-04-02 02:23:43 +02:00
Mark Story
9892cd0240
Merge pull request #3196 from bcrowe/2.5-fix-merge
...
Remove leftover HEAD from merge
2014-04-01 20:04:11 -04:00
Bryan Crowe
c7af3da371
Remove leftover HEAD from merge
2014-04-01 19:54:45 -04:00
ADmad
7a4a806db1
Merge pull request #3193 from beporter/feature/phpunit-required-version
...
Adds phpunit required version to TestShell "not found" error message.
2014-04-01 21:54:28 +05:30
Brian Porter
e5dd8acb60
Adds phpunit required version to TestShell "not found" error message.
2014-04-01 11:08:46 -05:00
Mark
997154565f
Merge pull request #3186 from bcrowe/hotfix-yoda-test
...
Fix yoda condition in File test
2014-04-01 00:56:29 +02:00
Bryan Crowe
b93f373f16
Fix yoda condition in File test
2014-03-31 17:40:35 -04:00
mark_story
7419ac35b0
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
2014-03-30 21:25:19 -04:00
