mark_story
37fe25909f
Merge branch '2.7' into 2.8
2015-12-20 21:59:43 -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
Mark Story
1af5d23e87
Merge pull request #7806 from ravage84/patch-1
...
Include the Code of Conduct in the 2.x branch
2015-12-07 12:58:20 -05:00
Marc Würth
d6da07c7a9
Include the Code of Conduct in the 2.x branch
...
Even though I don't think we need a CoC at all, if we have one, it should be included in all relevant branches.
2015-12-07 12:54:39 +01:00
Mark Story
5852ecec5a
Merge pull request #7766 from wiserfirst/split_protocol_from_host
...
Fixed issue incorrect SNI validation when host name contains protocol for SmtpTransport.
2015-12-02 13:53:17 -05:00
Qing Wu
48dd778bd0
Fixed issue #7579 on the 2.7 branch
2015-12-02 10:24:16 +11:00
José Lorenzo Rodríguez
caf93bf923
Merge pull request #7752 from ichikaway/2.7-remove-extract
...
remove extract function in the Validation::comparison
2015-11-30 08:50:04 +01:00
Yasushi Ichikawa
bed76acea1
fixed coding standards error
2015-11-29 23:37:07 +09:00
Yasushi Ichikawa
5b098af240
remove extract function in the Validation::comparison
2015-11-29 22:42:55 +09:00
mark_story
7aa6908800
Update version number to 2.7.7
2015-11-22 21:29:57 -05:00
mark_story
7bbdcb207b
Merge branch 'memory-fix' into 2.8.
...
This change automatically increases the memory limit when handling fatal
errors. The intent is to bump the memory limit enough to allow logging
of the fatal error source.
Refs #7224
2015-11-19 21:41:07 -05:00
Mark Story
5ac7b875e9
Merge pull request #7680 from chinpei215/magic-find
...
Magic call with custom finders
2015-11-15 21:02:18 -05:00
mark_story
48450e71fa
Merge branch '2.7' into 2.8
2015-11-11 22:53:45 -05:00
mark_story
7cc163d9b8
Merge branch 'fix-sni' into 2.7
...
Refs #7675
2015-11-11 22:53:08 -05:00
mark_story
079d15d54f
Handle enhanced config in a more graceful way.
...
HttpSocket further munges the host into a nested array. This config
value should be preferred over the top level host config.
Refs #7675
2015-11-11 22:51:17 -05:00
chinpei215
726699ee7a
Magic call with custom finders
...
Now we can use findListBy, etc - closes #7674
2015-11-11 22:43:19 +09:00
Richard van den Berg
f8e7634131
Use hostname of request instead of hostname of proxy for SNI
2015-11-10 10:54:36 +01:00
José Lorenzo Rodríguez
65b84107a1
Merge pull request #7673 from cakephp/issue-7661
...
In CLI mode default the error handlers to Console flavors.
2015-11-10 09:38:35 +01:00
mark_story
89d5449270
In CLI mode default the error handlers to Console flavors.
...
In the somewhat rare case where an error or exception occurs during
application bootstrap, we should not emit HTML to the stdout.
Refs #7661
2015-11-09 21:47:16 -05:00
mark_story
df3c786f57
Update version number to 2.7.6
2015-11-05 22:30:43 -05:00
mark_story
1a6f733286
Merge branch '27-pages-fix' into 2.7
2015-11-05 22:30:25 -05:00
Jose Lorenzo Rodriguez
18544c5aaa
Fix validation allowing arrays.
...
Accepting arrays can cause a number of adverse effects. While this may
be a breaking change the alternatives are worse.
2015-11-04 21:35:05 -05:00
Mark Story
e7eeafcddd
Merge pull request #7642 from steinkel/issue/missing-flash-bake-and-scaffold
...
add Flash back to Controller, fix Scaffold to use Flash instead
2015-11-04 21:27:26 -05:00
Jorge González
5845cad93f
fix phpcs
2015-11-04 16:37:21 +00:00
Jorge González
cb6a17c34e
add Flash back to Controller, fix Scaffold to use Flash instead
2015-11-04 10:41:35 +00:00
mark_story
5e60cc5d18
Fix plugin view names being able to escape the plugin root directory.
...
Remove the ability to specify completely arbitrary view files. This is
possibly a breaking change. However, I feel the risks out weigh the
benefits in this situation. Now absolute paths must be located *within*
a configured view path.
2015-11-01 22:04:15 -05:00
Mark Story
aa66293310
Merge pull request #7624 from rchavik/2.8-redis-cache-fix
...
Workaround for Cache::write() call from DboSource::__destruct()
2015-10-30 21:58:05 -04:00
ADmad
90c9ead8cd
Fix CS error
2015-10-30 09:28:03 +05:30
ADmad
b9dc89acff
Update docblock
2015-10-30 09:24:22 +05:30
Rachman Chavik
c1b6f89b23
Workaround for Cache::write() call from DboSource::__destruct()
...
Closes #7559
2015-10-30 10:14:16 +07:00
Mark Story
9c804186af
Merge pull request #7614 from ravage84/2.7-timehelper-engine-type-hint
...
Specify type hint
2015-10-27 20:56:27 -04:00
