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 8e3d6cffb7, reversing
changes made to 92800889a6.
|
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 |
|
mark_story
|
f9b45f1b60
|
Merge branch 'master' into 2.5
|
2014-03-30 21:24:55 -04:00 |
|
Mark Story
|
11a5a0ae35
|
Merge pull request #3152 from ADmad/2.5-controller-invoking
2.5 controller invoking
|
2014-03-30 20:50:52 -04:00 |
|
ADmad
|
10f294d6bb
|
Remove $reponse param of Dispatcher::_invoke().
Use controller's $response property by default.
|
2014-03-30 19:29:07 +05:30 |
|
mark_story
|
d713ff2c6a
|
Correct docblock.
Refs #3147
|
2014-03-29 20:19:34 -04:00 |
|
Mark Story
|
d05afe2899
|
Merge pull request #3147 from planardothum/persistent-fixture
Expose canUseMemory
|
2014-03-29 20:18:56 -04:00 |
|
Mark Story
|
d3855f869a
|
Merge pull request #3156 from sam-at-github/acl-shell-delete-all
Make `cake acl delete <acl-object>` delete all matching records.
|
2014-03-29 08:58:04 -04:00 |
|
sam-at-github
|
dbbf6c6ad9
|
No array short syntax in 2.4\!
|
2014-03-29 22:40:58 +11:00 |
|
sam-at-github
|
863a8555d9
|
Fixed CS issues. Fixed bug - added missing condition to find.
|
2014-03-29 22:36:06 +11:00 |
|
sam-at-github
|
a3fe7cd245
|
on cake acl delete <> delete all matching records. Makes more sense than deleting one of possibly many.
|
2014-03-29 13:37:08 +11:00 |
|
Harold Putman
|
522b5048f8
|
Expose canUseMemory
This lets Fixture be used to create an actual persistent table with InnoDB engine instead of MEMORY.
|
2014-03-28 09:24:49 -04:00 |
|
Mark Story
|
77db212b38
|
Merge pull request #3146 from sam-at-github/baseauthorize-crud
Removed arbitrary restriction on crud operations in BaseAuthorize.
|
2014-03-28 07:10:36 -04:00 |
|
sam-at-github
|
5ceb4abe1a
|
Removed arbitrary restriction on crud operations. Added some comments to explain parameters to mapActions() better.
|
2014-03-28 13:35:08 +11:00 |
|
mark_story
|
6bf21c4a43
|
Update doc blocks to not be lies.
|
2014-03-27 11:55:54 -04:00 |
|
mark_story
|
c17cc39f08
|
Update version number to 2.5.0-beta
|
2014-03-25 21:31:38 -04:00 |
|
mark_story
|
381b3fc9c3
|
Merge branch 'master' into 2.5
|
2014-03-25 21:30:56 -04:00 |
|
Mark Story
|
21d91b15bd
|
Merge pull request #3110 from cakephp/2.5-dbosource-joins
Insert manual joins *after* generated joins.
|
2014-03-24 15:23:20 -04:00 |
|
mark_story
|
ff73229ab8
|
Fix failing tests.
Not everyone uses the same database names as me.
|
2014-03-24 10:04:19 -04:00 |
|