Commit graph

18987 commits

Author SHA1 Message Date
Val Bancer
31fd4217b1 more PaginatorComponent unit tests 2017-07-04 23:01:17 +02:00
mark_story
1d1a762a37 Merge branch 'issue-10830' into 2.x
Fix current_timestamp() handling in MariaDB
2017-07-02 11:07:59 -04:00
mark_story
32f6b96060 Fix formatting. 2017-07-02 11:06:39 -04:00
Kurre Ståhlberg
4ec195f9c8 Fix error when default value is reported as CURRENT_TIMESTAMP() with parenthesis 2017-06-27 11:46:51 +03:00
Mark Story
8cd930d19e Merge pull request #10764 from bancer/translate-inner-joins
Add left join support in TranslateBehavior
2017-06-26 21:40:42 -04:00
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
c4766d667b Fix PHPCS error. 2017-06-14 09:38:06 -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
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
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
Mark Story
910d04584f Merge pull request #10695 from gemal/2.x
add polish locale
2017-05-26 16:14:49 -04: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
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
Nicola Beghin
09a981ba38 code style fix as requested 2017-04-23 18:44:42 +02:00
Nicola Beghin
99d02a8698 fix permission 2017-04-23 18:41:45 +02:00
Nicola Beghin
a1eb067c71 bugfix basic to Basic 2017-04-23 18:27:09 +02:00
mark_story
043b320358 Update version number to 2.9.8 2017-04-21 21:26:39 -04:00
Mark Story
43487d3393 Merge pull request #10560 from liviascapin/patch-2
Added documentation for App.base
2017-04-19 11:44:15 -04:00
Livia Scapin
ce9f33314d Added documentation for App.base
As discussed in https://github.com/cakephp/docs/issues/4895
2017-04-19 17:12:24 +02:00
Mark Story
eb937e3c79 Merge pull request #10557 from ndm2/2.x-fix-controller-test-case-base-incompatibility
2.x - Fix query string data in URL arrays not being passed anymore (#10517 follow-up)
2017-04-18 20:01:38 -04:00
ndm2
efb3474420 Fix query string data in URL arrays not being passed anymore.
refs #10555, #10517, #5473
2017-04-18 20:54:34 +02:00
Mark Story
c1f1d79f10 Merge pull request #10526 from cakephp/issue-10521
Fix notBlank() to pass on -0.0
2017-04-17 20:33:15 -04:00
mark_story
ea05b04193 Add additional test for -0.0
In PHP5 `-0.0` doesn't work. Include the other way of making -0 for
PHP5.

Refs #10521
2017-04-16 23:00:31 -04:00
mark_story
9007a7fe58 Fix notBlank() to pass on -0.0
Copy the implementation from 3.x as it works with -0.0 already.

Refs #10521
2017-04-16 09:57:36 -04:00