euromark
2990c2143c
Correct assert argument order.
2014-11-11 01:49:19 +01:00
mark_story
3095187952
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-11-10 19:38:31 -05:00
José Lorenzo Rodríguez
b5eb51deee
Merge pull request #5123 from cakephp/issue-4993
...
Remove singularization on schema class names
2014-11-10 09:04:16 +01:00
mark_story
7718d473c4
Remove singularization on schema class names.
...
Using camelize() does the transformation we want without also
singularizing the name. This makes user input more transparent and fixes
issues around plugin schemas with plural names.
Refs #4993
2014-11-09 21:52:10 -05:00
mark_story
9ce3d89c81
Clean up formatting and make a failure exit non-zero.
...
Console tools should exit non-zero when a comman fails.
Refs #4993
2014-11-09 21:21:42 -05:00
Mark Story
c1063dcd81
Merge pull request #5119 from ndm2/fix-unset-email-pattern
...
Make unsetting the email pattern work as expected.
2014-11-09 13:25:45 -05:00
ndm2
f0b6657113
Make unsetting the email pattern work as expected.
...
When set to `null`, only `filter_var()` should be used. This is a
partial backport of #5111
2014-11-09 16:33:57 +01:00
Mark Story
4242ce453f
Merge pull request #5093 from cakephp/2.6-returns
...
Simplify return types.
Update code to use documented return types where possible, and reduce number of return types.
2014-11-08 14:58:22 -05:00
euromark
41c646c5a1
Simplification of return types. No need to return more mixed than necessary.
2014-11-08 20:07:47 +01:00
mark_story
cc1fd33d0b
Update version number to 2.6.0-RC1
2014-11-07 20:36:25 -05:00
mark_story
c151ea585d
Update version number to 2.5.6
2014-11-07 20:35:12 -05:00
mark_story
0cd56880b0
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-11-07 15:14:05 -05:00
mark_story
0e4fb9d648
Merge branch 'master' into 2.6
2014-11-07 15:13:46 -05:00
José Lorenzo Rodríguez
176473b549
Merge pull request #5096 from cakephp/issue-5076
...
Fix HttpSocket mishandling encoded URIs
2014-11-06 10:30:01 +01:00
mark_story
6aaac6b7e2
Fix HttpSocket mishandling encoded URIs
...
The HTTP specs seem to indicate that the Location header should contain
an 'absoluteURI' which includes encoded data. In order to avoid
a regression with the issue fixed in b9ee4fc9f1Fixes #5076
2014-11-05 22:18:48 -05:00
mark_story
dac8b7b644
Update return type for Model::saveField().
...
Fixes #5086
2014-11-05 20:37:43 -05:00
Sebastien Barre
4bada05028
Fix doc/style
2014-11-05 18:37:20 -05:00
Sebastien Barre
ee73c1732b
Have BaseAuthenticate implement CakeEventListener instead
2014-11-05 18:03:26 -05:00
euromark
345a18f15f
Merge branch 'master' into 2.6
2014-11-05 23:29:06 +01:00
Sebastien Barre
f78e6c0621
Move App::uses() again
2014-11-05 13:46:45 -05:00
Sebastien Barre
4c59ab6eca
Move App::uses(), rename helper class to avoid conflict
2014-11-05 13:36:29 -05:00
Sebastien Barre
0cdb93b265
Ticket 5041: have Auth::login() send Auth.afterIdentify event
2014-11-05 12:34:25 -05:00
Mark Story
d5d8b32bd7
Merge pull request #5084 from cakephp/master-docblock-return
...
Correct doc block return types.
2014-11-05 08:00:39 -05:00
euromark
0d5d6b19b5
Wording correction.
2014-11-05 13:14:45 +01:00
euromark
768f2c809c
Correct doc block return types.
2014-11-05 13:03:27 +01:00
mark_story
07c91d4b3e
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-11-04 22:44:28 -05:00
mark_story
48101e6bf5
Merge branch 'master' into 2.6
2014-11-04 22:44:11 -05:00
Mark Story
96b82e4226
Merge pull request #5021 from dereuromark/master-mysql
...
Fix IN replacement in virtual fields for MYSQL.
2014-11-04 08:24:03 -05:00
Mark Story
c3fde9b16f
Merge pull request #5054 from dereuromark/2.6-paginator
...
Add a method for generating pagination meta links.
2014-11-03 19:38:49 -05:00
euromark
a6bd133413
Correct typos.
2014-11-02 22:41:17 +01:00
euromark
e7f76a983a
Add a method for generating pagination meta links.
2014-11-02 22:29:02 +01:00
Mark Story
279d15aaa5
Merge pull request #5053 from dereuromark/master-xdebug
...
Show stack trace for fatal errors if xdebug is loaded.
2014-11-02 15:03:39 -05:00
euromark
00432fa427
Show stack trace for fatal errors if xdebug is loaded.
2014-11-02 20:44:17 +01:00
Mark Story
fb90362121
Merge pull request #5027 from sebastienbarre/ticket-5017
...
ticket #5017 add userFields setting to BaseAuthenticate
2014-11-01 21:28:46 -04:00
Sebastien Barre
2995d9319c
Prepend model alias for safety
2014-11-01 09:36:59 -04:00
Sebastien Barre
417c137d11
Fix DigestAuthenticate test
2014-10-31 21:42:18 -04:00
Sebastien Barre
544ddac08c
Fix indentation
2014-10-31 16:38:09 -04:00
Sebastien Barre
60917974bf
Add test for userFields and related models
2014-10-31 16:35:55 -04:00
Sebastien Barre
f6c71024c5
Add test for the 'contain' setting, which was missing (unrelated to feature)
2014-10-31 16:04:09 -04:00
Sebastien Barre
2f62ee2cde
ticket #5017 add userFields setting to BaseAuthenticate
2014-10-31 15:00:19 -04:00
mark_story
579b16d90b
Merge branch 'master' into 2.6
2014-10-30 21:20:53 -04:00
euromark
0f9890720e
Correct test
2014-10-31 01:45:41 +01:00
euromark
bb67df4305
Simplify test
2014-10-31 01:18:08 +01:00
Mark Story
a8c5b70b22
Merge pull request #4489 from busgurlu/patch-1
...
to correctly return SET() type
2014-10-30 19:56:47 -04:00
euromark
70acd2fe3f
doc block update.
2014-10-30 19:15:23 +01:00
euromark
e5b45bcdea
Fix IN replacement in virtual fields for MYSQL.
2014-10-30 19:14:04 +01:00
mark_story
1e8f12f9f5
Bump the depth of variables in stack traces to 4.
...
Giving more context allows developer to look at request/response data
more easily.
Fixes #5005
2014-10-29 21:43:18 -04:00
Mark Story
94d56a3d74
Merge pull request #4985 from fixon/issue-2172
...
Make CakeResponse::file() accept ranges even when download option is fal...
2014-10-29 07:52:09 -04:00
José Lorenzo Rodríguez
a0aac5cfa9
Merge pull request #5001 from cakephp/issue-4990
...
Relative paths should be created relative to pwd.
2014-10-28 14:20:30 +01:00
José Lorenzo Rodríguez
9d0390ca63
Merge pull request #4953 from jrbasso/2.6-route-set-state
...
Implementing __set_state for CakeRoute
2014-10-28 09:36:42 +01:00
