Mischa ter Smitten
dec7f54ecb
Fixed typos
2016-11-11 21:43:43 +01:00
Mischa ter Smitten
94572ae384
Do not use deprecated assertIsA
2016-11-11 21:41:23 +01:00
Mischa ter Smitten
175503fafa
Expose engines
...
By implementing the `engine` method just like in version 3
2016-11-11 13:42:22 +01:00
mark_story
23009ae3cc
Update build config for new pear server.
...
Point to the new dokku based pear server. Put the files in the new
location and rebuild the dokku app.
2016-11-10 19:41:07 -05:00
Mark Story
f46f042001
Merge pull request #9717 from bancer/shell-webroot
...
accept webroot shell parameter
2016-11-08 21:12:50 -05:00
Val Bancer
38518c201c
doc blocks adjusted
2016-11-08 11:35:01 +01:00
Val Bancer
7ffa7acea6
fixed shell dispatcher failed unit test
2016-11-08 11:04:27 +01:00
Val Bancer
92e380737d
fixed failing shell dispatcher test
2016-11-08 10:44:08 +01:00
Val Bancer
467ee851bf
some refactoring to fix failed shell dispatcher tests
2016-11-08 10:03:46 +01:00
mark_story
86b5401778
Update version number to 2.9.2
2016-11-07 21:40:22 -05:00
Val Bancer
aa21244593
accept webroot shell parameter
2016-11-08 00:40:46 +01:00
Mark Sch
2faee97743
Merge pull request #9714 from cakephp/2x-auto-content
...
Autodetect content-types for email attachments (2.x)
2016-11-07 11:41:13 +01:00
mark_story
3837f40394
Autodetect content-types for email attachments (2.x)
...
This ports the safe parts of #9619 and updates the tests. Because
existing tests had to change and I was concerned about changing people's
email messages in a bugfix release I'm targetting 2.next with this
change.
2016-11-06 21:49:15 -05:00
mark_story
c0150f62ed
Merge branch '2.x' into 2.next
2016-11-06 21:42:31 -05:00
Mark Story
0dcb5ffbfe
Merge pull request #9703 from cakephp/issue-9698
...
Fix HttpSocket emitting errors when nameless cookies are encountered.
2016-11-04 21:51:36 -04:00
mark_story
9d94487b23
Fix PHPCS
...
Refs MATES-9698
2016-11-04 09:31:05 -04:00
Rodrigo Pérez
c0aa418984
refs #backport-paginate-multiple-queries fix array notation to be compatible with php 5.3
2016-11-04 11:19:43 +00:00
Rodrigo Pérez
20da4484de
refs #backport-paginate-multiple-queries Backporting cakephp 3.3 feature to paginate multiple queries
2016-11-04 11:10:28 +00:00
mark_story
6a201696dd
Fix HttpSocket emitting errors when nameless cookies are encountered.
...
Refs #9698
2016-11-03 19:07:25 -04:00
Mark Story
25b62b6c5d
Merge pull request #9664 from xhs345/2.x-stacking-flash-messages
...
2.next Support Stacking Flash Messages
2016-11-01 21:24:24 -04:00
xhs345
e1c5ef9e7a
Add clear option to Flash Message
...
To give user the option to disable Stacking of messages and being consistent with 3.x
2016-10-30 20:39:00 -07:00
Mark Story
7f0b0739a8
Merge pull request #9667 from bancer/components-enabled-setting
...
fixed configuration of 'enabled' setting in components inside a
2016-10-28 22:09:37 -04:00
Val Bancer
744b455de1
fixed configuration of 'enabled' setting in components inside a
...
component
2016-10-28 22:14:20 +02:00
xhs345
924d382bb3
Fix tests
2016-10-28 09:10:01 -07:00
xhs345
c59fb85da8
Add support for stacking Flash messages
...
See Issue #7830
2016-10-28 09:10:01 -07:00
mark_story
135a24e0f1
Merge branch '2.x' into 2.next
2016-10-28 00:29:46 -04:00
Mark Story
1a58d15632
Merge pull request #9635 from cakephp/issue-9632
...
Allow '' to be a valid key for Hash, and Session
2016-10-26 21:16:20 -04:00
Mark Story
d7f82608c9
Merge pull request #9643 from xhs345/patch-1
...
In composer.json: Update CakePHP version to 2.9
2016-10-23 10:08:29 -04:00
Alex
6bae308778
Update CakePHP version to 2.9
2016-10-22 20:22:21 -07:00
mark_story
c935bed8f6
Fix PHPCS
2016-10-21 18:35:05 -04:00
mark_story
816801902e
Allow '' to be a valid key for Hash, and Session
...
By removing a bunch of empty() guards we can make '' behave like all the
other key names. This does change the existing behavior/tests around ''
key, but I think that is ok given the need to manipulate ''.
Refs #9632
2016-10-21 10:54:39 -04:00
Mark Story
cf7473aacc
Merge pull request #9616 from chinpei215/2.10-debug-security
...
[2.10] Backporting security debug to 2.x
2016-10-17 08:28:26 -04:00
chinpei215
3102d89313
Fix a test for PHP5.3
2016-10-16 22:40:27 +09:00
chinpei215
739664d6c7
Add more tests
2016-10-16 22:28:28 +09:00
chinpei215
d7ae1c92e7
Backport test cases and make sure those pass
2016-10-16 22:04:24 +09:00
chinpei215
0d96b9ff64
Backport changes in SecurityComponent and FormHelper
2016-10-16 21:55:05 +09:00
chinpei215
3ccc35b32c
Start working on backporting security debug to 2.x
...
- Add SecurityException
- Add AuthSecurityException
Refs #8449
2016-10-16 11:47:26 +09:00
Mark Sch
40c32e8bdf
Merge pull request #9605 from TekkCraft/2.x-mapresource
...
Add connectOptions to doc block
2016-10-12 15:28:36 +02:00
TekkCraft
1c37640678
Add connectOptions to doc block
2016-10-12 15:25:31 +02:00
Mark Story
a3577978b0
Merge pull request #9603 from cakephp/issue-9592
...
Fix warning in PHP 7.1
2016-10-11 17:23:00 -04:00
mark_story
8baf193995
Fix warning in PHP 7.1
...
Refs #9592
2016-10-11 16:59:35 -04:00
mark_story
6cdf38c2ef
Update version number to 2.9.1
2016-10-10 21:36:32 -04:00
mark_story
ecd270d04b
Tweak/Add doc blocks.
2016-10-09 11:05:35 -04:00
Mark Story
e8683fdde5
Merge pull request #9587 from dmaicher/model-query-cache
...
[Bugfix] use Model::$cacheQueries as default for ->query(...) (#9575 )
2016-10-09 11:00:49 -04:00
David Maicher
a932bce3de
[Bugfix] use Model::$cacheQueries as default for ->query(...)
2016-10-09 13:43:27 +02:00
Mark Story
b790398efb
Merge pull request #9567 from AshleyPinner/2.next
...
(2.next) Adding Base64 support to the HtmlHelper::image() function
2016-10-07 20:40:23 -04:00
Mark Story
c4d98cf029
Merge pull request #9581 from cakephp/dereuromark-patch-1
...
Fix broken template
2016-10-07 09:46:17 -04:00
Mark Sch
a35eec3f1b
Fix broken template
2016-10-07 12:25:24 +02:00
Mark Story
e784f67e26
Merge pull request #9577 from cakephp/2.x-cleanup
...
Remove dead code
2016-10-06 22:03:13 -04:00
Mark Sch
bf908762db
Remove dead code
2016-10-07 01:35:26 +02:00
