Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove "Display secure content only" option #469

Merged
merged 1 commit into from
Mar 21, 2017

Conversation

yuya-oc
Copy link
Contributor

@yuya-oc yuya-oc commented Mar 18, 2017

Before submitting, please confirm you've

Please provide the following information:

Summary
Remove "Display secure content only" option.

allowDisplayingInsecureContent is removed in Electron 1.6 electron/electron@2e07803.
And it's no longer necessary to show http contents in https server.

Issue link
N/A

Test Cases

  1. Post a HTTP link or an embedded image (![image](URL)) in a channel provided by HTTPS.
  2. The image should appear.

Tested on Windows 10 and macOS 10.12.3.

Additional Notes
https://circleci.com/gh/yuya-oc/desktop/192#artifacts

allowDisplayingInsecureContent is removed in Electron 1.6.
And it's no longer necessary to show http contents in https server.
@jasonblais
Copy link
Contributor

Tested, works on Windows:

image

@jnugh would you be able to help test this on Linux?

@jnugh
Copy link
Contributor

jnugh commented Mar 20, 2017

The images posted by @yuya-oc in the public test channel do not work... (But they don't render in the browser as well).

[Mattermost] Redirect from 'http://www.mattermost.org/wp-content/uploads/2016/03/logoHorizontal.png' has been blocked by CORS policy: No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'https://pre-release.mattermost.com' is therefore not allowed access.

however other http image worked well.

@jasonblais
Copy link
Contributor

ah yes, there's an issue on the master branch (and hence the pre-release instance) where images aren't loading properly..

in case you want to try and ensure it works on the desktop app, you can try on Mattermost v3.7.2 build here: https://rctesting.reddogsofwar.com

@jnugh
Copy link
Contributor

jnugh commented Mar 20, 2017

Yeah, I checked on another instance. It's working fine ;)

@jasonblais
Copy link
Contributor

Thanks @jnugh!

@yuya-oc I think we should be good to merge then

@jasonblais jasonblais added this to the v3.7.0 milestone Mar 20, 2017
@yuya-oc
Copy link
Contributor Author

yuya-oc commented Mar 21, 2017

Thanks all!

@yuya-oc yuya-oc merged commit 0e61fd5 into mattermost:master Mar 21, 2017
@yuya-oc yuya-oc deleted the remove-secure-contents-only branch March 21, 2017 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants