Mark S
bca3064df2
Merge pull request #7903 from cakephp/2.8-return-reponse
...
Always return response in redirect() for testing.
2015-12-26 16:16:43 +01:00
mark_story
b5e64bbad5
Merge branch '2.7' into 2.8
2015-12-24 16:20:27 -05:00
mark_story
7d052bdbc1
Backport 5714cf14a9ca4b439b872aaf3ad6e5bfddda46ad to 2.x
...
Fix file:// paths being mishandled on windows.
While I don't think its feasible to fix all the cases reported in #7275
as certain paths have different meaning in windows, we can fix file://
not working.
Refs #7275
2015-12-24 16:19:57 -05:00
Mark Scherer
12b4c9ba24
Fix bracket syntax.
2015-12-23 21:45:15 +01:00
Mark Scherer
8b5ef12ccb
Always return response in redirect() for testing.
2015-12-23 21:29:19 +01:00
Mark Story
73badc9c19
Merge pull request #7893 from cakephp/2.7-output-console
...
Remove an empty line output
2015-12-22 11:11:12 -05:00
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
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
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
Gareth Ellis
7ba19c717e
Update docblock for ConsoleOutput::overwrite() $size param
2015-12-01 17:09:42 +00:00
Gareth Ellis
031ae3d105
Use traditional array syntax
2015-12-01 15:37:06 +00:00
Gareth Ellis
d84b6a2c22
Use traditional array syntax
2015-12-01 15:32:54 +00:00
Gareth Ellis
56cfe8492a
Use traditional array syntax
2015-12-01 15:32:06 +00:00
Gareth Ellis
3f992695b2
Use traditional array syntax
2015-12-01 15:16:54 +00:00
Gareth Ellis
1bd22e5277
Add test for ConsoleOutputStub
2015-12-01 14:32:59 +00:00
Gareth Ellis
eafee25d13
PHPCS fixes
2015-12-01 14:26:22 +00:00
Gareth Ellis
6b6a90e5c1
Add table shell helper
2015-12-01 13:29:08 +00:00
Gareth Ellis
53b9dc83f6
Add helper method to shell class for loading/fetching helper instances
2015-12-01 13:07:56 +00:00
Gareth Ellis
2854940693
Renamed progress helper files to include Shell to avoid conflicts with existing view helpers
2015-12-01 13:07:32 +00:00
Gareth Ellis
788c57dd4b
Add progress helper
2015-12-01 12:03:09 +00:00
Gareth Ellis
e580ad813e
Add overwrite method to ConsoleOutput class
2015-12-01 12:01:39 +00: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