Val Bancer
5b37d42f97
joinType moved from $settings to $runtime
2017-06-26 23:02:06 +02:00
Mark Story
2b8447dc5b
Merge pull request #10766 from cakephp/issue-10763
...
Fix encoding of addreses contain comma & unicode
2017-06-16 21:37:54 -04:00
Mark Story
05d30a6f05
Merge pull request #10749 from ikuwow/2.next-fix-broken-cookie
...
Fix broken cookie issue
2017-06-15 21:15:13 -04:00
Mark Story
52790443e8
Merge pull request #9705 from CakeDC/feature/backport-paginate-multiple-queries
...
2.next - Backport multiple paginators
2017-06-14 21:41:13 -04:00
mark_story
c4766d667b
Fix PHPCS error.
2017-06-14 09:38:06 -04:00
Mark Story
8289b367f9
Merge pull request #10698 from lucasferreira/2.next
...
Cake 2.x - Some fix into Paginator component for order / sort classic sintax
2017-06-14 00:13:00 -04:00
Val Bancer
0bfb19f126
left join support in TranslateBehavior
2017-06-12 21:41:35 +02:00
mark_story
738b20a19b
Fix encoding of addreses containin comma & unicode
...
Email addresses that contain both unicode and commas will not be
correctly encoded by mime_encode_header if the comma precedes the
unicode. In this scenario we have to quote the encoded address.
Refs #10763
2017-06-12 10:58:44 -04:00
Mark Story
3d94f04640
Merge pull request #10755 from ravage84/2.x-https-urls
...
2.x Use HTTPs URLs
2017-06-11 13:32:38 -04:00
Mark Story
0007a03ab8
Merge pull request #10754 from cakephp/fix-2next-tests
...
Fix 2.next tests
2017-06-11 07:56:07 -04:00
Marc Würth
a99f60fb75
Revert URl change in test
2017-06-11 01:11:32 +02:00
Marc Würth
1ce2389069
Fix broken tests
2017-06-11 01:02:49 +02:00
Marc Würth
4dfae7ad7a
Use HTTPS for other URLs
2017-06-11 00:50:09 +02:00
Marc Würth
88aadf3804
Use HTTPS for the www.cakephp.org URL
...
Do not change those in tests.
2017-06-11 00:43:06 +02:00
Marc Würth
deee18c96e
Use HTTPS for the community.cakephp.org URL
2017-06-11 00:30:48 +02:00
Marc Würth
d5aa04e39d
Use HTTPS for the plugins.cakephp.org URL
2017-06-11 00:28:44 +02:00
Marc Würth
d03a682eeb
Use HTTPS for the bakery.cakephp.org URL
2017-06-11 00:27:59 +02:00
Marc Würth
98f31dd791
Use HTTPS for the api.cakephp.org URL
2017-06-11 00:26:56 +02:00
Marc Würth
da8414e13b
Use HTTPS for the opensource.org MIT license URL
2017-06-11 00:23:22 +02:00
Marc Würth
04efc7ba50
Use HTTPS for the book.cakephp.org URL
2017-06-11 00:15:36 +02:00
Marc Würth
10b89b51a9
Use HTTPS for the cakefoundation.org URL
2017-06-11 00:10:59 +02:00
Marc Würth
17314baa15
Use HTTPS for the cakephp.org URL
2017-06-10 23:40:28 +02:00
mark_story
f4ea6ca644
Don't use default in test.
...
It likely doesn't exist.
2017-06-10 17:35:45 -04:00
mark_story
ef45d24134
Fix tests that failed because of CONFIG dir change.
2017-06-10 17:31:29 -04:00
Ikuo Degawa
655a5fe0ae
Fix broken cookie issue #10724
...
This change makes Security::cipher() encoding and decoding same as 2.7 and below.
2017-06-10 15:20:25 +09:00
Mark Story
e2d8f04f85
Merge pull request #10742 from tersmitten/discrepancy-in-modelid-when-using-classregistryinit-versus
...
Fix discrepancy in Model::field when Model::id is null
2017-06-08 22:05:40 -04:00
Mischa ter Smitten
377aa2aa74
Drop short array syntax for PHP < 5.4
2017-06-08 20:31:34 +02:00
Mischa ter Smitten
ddbdf170e6
Fix discrepancy in Model::field when Model::id is null
...
When using ClassRegistry::init for instance
2017-06-08 20:22:29 +02:00
Mark Story
77b7ccf3ad
Merge pull request #10739 from bancer/unnecessary-joins-delete-all
...
Takes into account the current recursive value in deleteAll().
2017-06-08 12:01:34 -04:00
Val Bancer
2677cf4053
Takes into account the current recursive value in deleteAll().
2017-06-07 23:38:12 +02:00
Lucas Ferreira
3258199193
Remove personal comments for pull request
2017-05-31 08:33:41 -03:00
mark_story
cf679a3233
Merge branch '2.x' into 2.next
2017-05-27 21:47:22 -04:00
Lucas Ferreira
ee1980b8f5
- Tests for array order syntax fix
2017-05-26 18:36:50 -03:00
Mark Story
910d04584f
Merge pull request #10695 from gemal/2.x
...
add polish locale
2017-05-26 16:14:49 -04:00
Lucas Ferreira
b539161b2d
- Some fix into Paginator component for order / sort classic sintax
2017-05-26 15:05:18 -03:00
Henrik Gemal
3f0fb07122
fix
2017-05-26 15:39:06 +02:00
Henrik Gemal
04e5fdc9b2
add polish locale
2017-05-26 11:11:10 +02:00
mark_story
bfd2d21d78
Update version number to 2.9.9
2017-05-25 21:15:23 -04:00
Mark Story
ffd9e71bb9
Merge pull request #10664 from ravage84/patch-2
...
Add inline type hint annotations
2017-05-16 12:13:24 -04:00
Marc Würth
bef0c766b6
Add inline type hint annotations
...
Improves the experience when debugging in an IDE
2017-05-16 13:24:25 +02:00
Mark Story
57ddc24b35
Merge pull request #10647 from josephzidell/2.next-custom-config-dir-loc
...
Add constant specifying the location of the Config dir
2017-05-14 21:41:09 -04:00
Joe
70ead28a1d
Redo commits on 2.next branch
2017-05-12 02:02:36 -04:00
Mark Story
88a804f552
Merge pull request #10497 from swordbeta/2.next-update-phpunit
...
Make test suite compatible with PHPUnit 5.
2017-05-08 09:44:04 -04:00
Mark Story
a7bcd18d4a
Merge pull request #10627 from chinpei215/2.next-empty-post
...
[2.next] Fix _validatePost returns true when empty form is submitted
2017-05-06 21:41:39 -04:00
chinpei215
a97bd234ee
Fix _validatePost returns true when empty form is submitted
...
Backport of #10625
2017-05-06 21:59:29 +09:00
mark_story
cfcbd6ea31
Merge branch '2.x' of github.com:cakephp/cakephp into 2.x
2017-04-28 21:50:20 -04:00
mark_story
5e35064a0b
Read basic auth credentials from Authorization header
...
Merge branch 'issue-9365' into 2.x
Refs #9365
2017-04-28 21:49:47 -04:00
mark_story
275385d676
Add test covering basic auth reading from headers.
...
In some FastCGI setups basic auth values will only be present in the
header. Fallback to reading that value if the PHP_AUTH super globals are
empty.
Refs #9365
2017-04-28 21:49:27 -04:00
Mark Sch
0e07b74d46
Merge pull request #10596 from ravage84/patch-1
...
Really correct return type
2017-04-29 01:07:16 +02:00
Marc Würth
6321d5612a
Really correct return type
2017-04-29 00:49:28 +02:00
