Mark Story
aa449b194d
Merge pull request #8125 from CakeDC/issue/7978
...
Add support for NOT IN in Model::find() conditions.
Refs #7978 fixing regex to take in account IN operator
2016-01-28 21:48:04 -05:00
Mark Story
48fd12c350
Merge pull request #8126 from garas/phpdoc-fixes
...
Phpdoc fixes
2016-01-28 17:50:15 -05:00
Edgaras Janušauskas
6e54a7391c
Use more specific datatypes in PHPDoc
2016-01-28 23:10:51 +02:00
Edgaras Janušauskas
fde1d08b43
Fix PHPDoc @return by replacing $this to self
2016-01-28 23:10:42 +02:00
Pedro Fernandes Steimbruch
bf8e6ce576
Refs #7978 fixing code standard
2016-01-28 17:55:19 -02:00
Pedro Fernandes Steimbruch
eaeb7cea9e
Refs #7978 fixing regex to take in account IN operator
2016-01-28 17:34:08 -02:00
ADmad
a890d76990
Merge pull request #8107 from ndm2/2.7-fix-post-link-description
...
2.7 - Fix `FormHelper::postLink()` description.
2016-01-26 18:38:29 +05:30
ndm2
4e58d595ae
Fix FormHelper::postLink() description.
...
Update description with a short explanation that considers the
`inline` and `block` options.
2016-01-26 10:59:03 +01:00
mark_story
0edec3cfc6
Update version number to 2.7.9
2016-01-24 21:48:49 -05:00
Mark Story
109d604c79
Merge pull request #8075 from cakephp/security-method-2x
...
Backport SecurityComponent fixes from #8071 to 2.x
2016-01-21 18:56:21 -05:00
mark_story
4b8d628a2e
Backport SecurityComponent fixes from #8071 to 2.x
...
If the request manages to have data set outside of post/put we should
still validate the request body. This expands SecurityComponent to cover
PATCH and DELETE methods, as well as request methods that should be
safe, but somehow end up not safe.
2016-01-20 21:34:58 -05:00
Mark Story
983a2f65e8
Merge pull request #8068 from cakephp/2.7-backport-shell-corrections
...
Backport CODE_ERROR constant and return as per expectation.
2016-01-19 17:38:18 -05:00
José Lorenzo Rodríguez
1b2fcda4d2
Merge pull request #8065 from cakephp/2.7-method-override
...
2.7- Better method overriding emulation for GET
2016-01-19 14:07:44 -04:30
José Lorenzo Rodríguez
835fc9ce01
More CS fixes
2016-01-19 13:52:16 -04:30
mscherer
c06bde34d6
Backport CODE_ERROR constant and return as per expectation.
2016-01-19 16:53:23 +01:00
José Lorenzo Rodríguez
2962b387d7
Fixed CS error
2016-01-19 11:17:06 -04:30
José Lorenzo Rodríguez
3ee9f97826
Trying to fix tests
2016-01-19 11:03:07 -04:30
José Lorenzo Rodríguez
dc83669e9b
using the right superglobal
2016-01-19 10:43:12 -04:30
José Lorenzo Rodríguez
93ba85b8b8
Fixed failing test
2016-01-19 08:37:36 -04:30
Jose Lorenzo Rodriguez
bd53ef01a6
Better method overriding emulation for GET
2016-01-18 20:34:32 -04:30
Mark Story
b4960c7965
Merge pull request #8020 from tersmitten/fix-broken-memcached-socket-connection-2x
...
Memcached can not connect using a socket
2016-01-12 22:08:19 -05:00
Mischa ter Smitten
8d472a5d78
Memcached can not connect using a socket
...
Fixes #8018
2016-01-12 21:01:14 +01:00
mark_story
4de92123fa
Back port fixes from #7899 to 2.x
...
Fix XmlView failing when return => domdocument is used.
2016-01-03 22:08:09 -05:00
José Lorenzo Rodríguez
c6d9911b9c
Merge pull request #7910 from cakephp/issue-7902
...
Backport paginator changes for string integers
2015-12-27 14:21:43 +01:00
mark_story
72b98f58a8
Backport paginator changes for string integers.
...
Backport the intent of #7845 into 2.x. The implementation differs a bit
from 3.x but paginator helper internals are pretty different in both
branches.
Refs #7092
2015-12-26 22:52:57 -05:00
mark_story
430612f1df
Split mega test up.
...
The previous testNumbers() method was a behemoth. Split out the
scenarios for first/last a bit.
Refs #7902
2015-12-26 22:37:25 -05:00
mark_story
7d052bdbc1
Backport 5714cf14a9ca4b439b872aaf3ad6e5bfddda46ad to 2.x
...
Fix file:// paths being mishandled on windows.
While I don't think its feasible to fix all the cases reported in #7275
as certain paths have different meaning in windows, we can fix file://
not working.
Refs #7275
2015-12-24 16:19:57 -05:00
Mark Story
73badc9c19
Merge pull request #7893 from cakephp/2.7-output-console
...
Remove an empty line output
2015-12-22 11:11:12 -05:00
Mark S
fd021909ba
Remove an empty line output
2015-12-22 17:10:42 +01:00
mark_story
2ee72e2ad2
Update version number to 2.7.8
2015-12-21 14:55:52 -05:00
José Lorenzo Rodríguez
591bdd6f44
Merge pull request #7882 from cakephp/travis-builds
...
Remove lighthttpd
2015-12-20 14:55:46 +01:00
mark_story
1b4c81ebd1
Remove lighthttpd
...
Attempting to install lighthttpd causes the travis build to fail.
2015-12-20 07:51:41 -05:00
Mark Story
f2f704dfd3
Merge pull request #7866 from garas/i18n-mo-loading-context
...
Use correct context when parsing MO file.
2015-12-20 07:42:16 -05:00
Mark Scherer
d2153ac1eb
Fix typo in doc block.
2015-12-19 20:07:13 +01:00
Mark Story
c97a9276bc
Merge pull request #7874 from cakephp/2.7-return-value
...
Fix doc block return statement in SmtpTransport
2015-12-19 13:59:40 -05:00
Mark Scherer
479eec4148
Fix doc block instead.
2015-12-19 18:25:30 +01:00
Mark Scherer
4136857278
Fix return value in SmtpTransport
2015-12-19 15:57:53 +01:00
Edgaras Janušauskas
4101a96a95
Use correct context when parsing MO file.
2015-12-18 12:59:00 +02:00
Mark Story
0668cc6ff1
Merge pull request #7865 from garas/model-cache-cleanup-after-schema-update
...
Clear model cache after schema update.
2015-12-17 23:18:45 -05:00
Edgaras Janušauskas
c6fdcea3aa
Clear model cache after schema update.
2015-12-17 22:38:35 +02:00
Mark Story
4faf31e60a
Merge pull request #7836 from RichieB2B/fix-proxy-auth-via-ssl
...
Fix proxy authentication when SSL is used
2015-12-15 21:56:40 -05:00
Richard van den Berg
2d178b7e10
PHPCS fixes
2015-12-15 19:58:11 +01:00
Richard van den Berg
e47b26aa6b
Do not redefine TestHttpSocket
2015-12-15 16:58:12 +01:00
Mark Story
2a290e3e85
Merge pull request #7814 from cakephp/2.7-cleanup-redirects
...
Remove default overwrites that are useless
2015-12-14 21:24:00 -05:00
Richard van den Berg
077f157adf
Test case for proxy authentication when request is HTTPS
2015-12-12 11:13:41 +01:00
Mark Story
039bad9d93
Merge pull request #7834 from RichieB2B/fix-ssl-via-proxy
...
Fix SSL via proxy when hostname has ssl://
2015-12-11 21:50:11 -05:00
Richard van den Berg
ac50b609ac
Added space
2015-12-11 15:01:05 +01:00
Richard van den Berg
e315fb6688
Fix proxy authentication when SSL is used
2015-12-11 14:44:46 +01:00
Richard van den Berg
4a4728b44d
Fix SSL via proxy
2015-12-11 10:28:53 +01:00
Mark S
b76a235175
Remove default overwrites that are useless
2015-12-08 18:21:51 +01:00
