Commit graph

19144 commits

Author SHA1 Message Date
Mark S
fd021909ba Remove an empty line output 2015-12-22 17:10:42 +01:00
mark_story
2ee72e2ad2 Update version number to 2.7.8 2015-12-21 14:55:52 -05:00
mark_story
8343f6c81d Merge branch '2.8' of github.com:cakephp/cakephp into 2.8 2015-12-21 12:41:52 -05:00
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
Mark Story
e7d6e3b137 Merge pull request #7767 from garethellis36/backport-shell-helpers-to-2.8
Backport shell helpers to 2.8
2015-12-19 00:55:20 -05: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
Larry E. Masters
577e1b089f Revert "Forcing bool return"
This reverts commit fac95baee7.
2015-12-14 19:31:08 -06:00
Larry E. Masters
572ca1458b Revert "Forcing bool"
This reverts commit 26ea74cbcf.
2015-12-14 19:30:52 -06:00
Larry E. Masters
dd211e9158 Revert "Changing where bool is returned"
This reverts commit 8f52cefdcc.
2015-12-14 19:30:42 -06:00
Larry E. Masters
464a266fc7 Revert "Using better way to check for active session"
This reverts commit 439a33c708.
2015-12-14 19:30:24 -06:00
Larry E. Masters
975262b03e Revert "Correcting return"
This reverts commit 6e09e64432.
2015-12-14 19:30:16 -06:00
Larry E. Masters
1a3598c3f4 Revert "session_status() not available until 5.4"
This reverts commit da9b6453ce.
2015-12-14 19:29:08 -06:00
Larry E. Masters
5790d49f5b Revert "Revert "Adding missing @return tag in function comment""
This reverts commit 1cc5c8cf7f.
2015-12-14 19:28:25 -06:00
Larry E. Masters
1cc5c8cf7f Revert "Adding missing @return tag in function comment"
This reverts commit 130e854c30.
2015-12-14 19:25:36 -06:00
Larry E. Masters
da9b6453ce session_status() not available until 5.4
Adding check for php version
2015-12-14 10:56:55 -06:00
Larry E. Masters
6e09e64432 Correcting return 2015-12-14 10:46:16 -06:00
Larry E. Masters
439a33c708 Using better way to check for active session 2015-12-14 10:42:46 -06:00
Larry E. Masters
8f52cefdcc Changing where bool is returned 2015-12-14 09:17:29 -06:00
Gareth Ellis
e640420dd9 Re-order code in Shell::helper() to return slightly earlier 2015-12-14 09:48:36 +00:00
Gareth Ellis
75cabfe78b Rename ShellHelper to BaseShellHelper to avoid potential naming conflicts with existing apps 2015-12-14 09:47:22 +00:00
Larry E. Masters
26ea74cbcf Forcing bool 2015-12-13 20:06:05 -06:00
Larry E. Masters
fac95baee7 Forcing bool return 2015-12-13 20:05:54 -06:00
Larry E. Masters
130e854c30 Adding missing @return tag in function comment 2015-12-13 15:38:39 -06:00
Larry E. Masters
894d233fd6 add @throws anotation to fix travis PHP_CODESNIFFER warnings 2015-12-13 15:16:49 -06:00
Larry E. Masters
6a68032e0b FIxing srand() expects parameter 1 to be integer, string given
Type casting to integer
2015-12-13 14:18:59 -06:00
Larry E. Masters
48e018e707 Allowing tests to run on PHP 7 2015-12-13 14:12:31 -06: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
Mark S
dcac9c4a0c Merge pull request #7807 from m1nd53t/2.8-PHP7
Removed last typehint Exception
2015-12-07 16:38:14 +01:00
Kars Frijters
2fdd3030e2 Removed last typehint Exception
#7671 Removed last typehint Exception as it was still giving an uncaught typeError message in PHP7
2015-12-07 16:25:14 +01: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 Scherer
f662b2f5aa Skip error for now. 2015-12-06 12:50:09 +01:00