chinpei215
f9d2a52152
Revert "Remove dead code"
...
This reverts commit bf908762db
2016-11-27 01:25:01 +09:00
mark_story
bbb87b3e87
Use null instead of false for failure.
...
null is better to indicate that a thing doesn't exist.
2016-11-26 10:38:28 -05:00
Mark Story
ba9f62a7a0
Merge pull request #9747 from tersmitten/cache-does-not-expose-configured-engines
...
Expose Cache engines
2016-11-26 10:16:20 -05:00
Mark Story
2e30cf7b89
Merge pull request #9782 from cakephp/acl-constructor
...
Fix AclNode constructor.
2016-11-24 16:56:02 -05:00
mark_story
e057b5572c
Fix PHPCS.
2016-11-21 20:51:12 -05:00
mark_story
71b7d6211b
Fix AclNode constructor.
...
It should forward the settings from ClassRegistry::init() so that
aliases can be customized as needed.
Refs #9766
2016-11-19 22:30:18 -04:00
mark_story
66363e6bea
Add tests for #9766
...
I'm not able to reproduce incorrect aliases coming out of ClassRegistry.
As reported.
2016-11-19 10:02:09 -04:00
Mark Sch
93e29e91ef
Merge pull request #9767 from ravage84/patch-7
...
Improve doc block
2016-11-17 14:56:58 +01:00
Marc Würth
5c184190c5
Improve doc block
2016-11-17 14:55:01 +01:00
Mark Story
5f1463f45b
Merge pull request #9750 from tersmitten/make-it-possible-to-configure-cachemethodhashalgo-in-dbosource
...
Make it possible to configure the cacheMethod hashing algorithm in DboSource
2016-11-14 12:00:33 -05:00
Mischa ter Smitten
e71afa225e
Merge remote-tracking branch 'upstream/2.x' into make-it-possible-to-configure-cachemethodhashalgo-in-dbosource
2016-11-14 16:26:48 +01:00
Mark Story
de3a249199
Merge pull request #9749 from tersmitten/make-it-possible-to-filter-values-per-method-in-dbosourcecachemethod
...
Make it possible to filter values per method in DboSource::cacheMethod
2016-11-14 10:08:00 -05:00
Mischa ter Smitten
936b9924b3
Add tests for overridden cacheMethodFilter
2016-11-14 12:51:57 +01:00
Mischa ter Smitten
1952d2ee17
Add tests for cacheMethodFilter
2016-11-14 11:44:35 +01:00
Mischa ter Smitten
71535d2d2c
Change cacheMethodFilters to be a method
2016-11-14 11:15:08 +01:00
Mischa ter Smitten
5947c2346b
Fix failing test
2016-11-14 10:53:33 +01:00
Mischa ter Smitten
7ffb5c3600
Add tests for cacheMethodHasher
2016-11-14 10:00:47 +01:00
Mischa ter Smitten
e186ffc6d3
Change cacheMethodHashAlgo to be a method
2016-11-14 09:42:19 +01:00
Mark Story
c5ec8db59a
Merge pull request #9743 from cakephp/new-pear-server
...
Update build config for new pear server.
2016-11-12 09:41:43 -05:00
mark_story
444cf1f16d
Fix hostname.
2016-11-12 09:41:28 -05:00
Mark Story
56a57bdb00
Merge pull request #9748 from tersmitten/fix-typos
...
Fixed typos
2016-11-11 23:03:02 -05:00
Mischa ter Smitten
15ccf057f4
Make it possible to configure cacheMethodHashAlgo in DboSource
2016-11-12 00:18:13 +01:00
Mischa ter Smitten
58cc9b4596
Make it possible to filter values per method in DboSource::cacheMethod
2016-11-11 23:37:23 +01:00
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
