phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add tests for disablewebsecurity (Allow mixed contents)

Browse Source
This commit is contained in:
Yuya Ochiai
2016-06-22 00:33:14 +09:00
parent eda5d56d78
commit 2347d5e299
2 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser/settings.jsx
View File

@@ -150,7 +150,7 @@ var SettingsPage = React.createClass({
<option value="dark">Dark</option>
</Input>);
}
options.push(<Input key="inputDisableWebSecurity" ref="disablewebsecurity" type="checkbox" label="Allow mixed content (Enabling allows both secure and insecure content, images and scripts to render and execute. Disabling allows only secure content.)"
options.push(<Input key="inputDisableWebSecurity" id="inputDisableWebSecurity" ref="disablewebsecurity" type="checkbox" label="Allow mixed content (Enabling allows both secure and insecure content, images and scripts to render and execute. Disabling allows only secure content.)"
checked={ this.state.disablewebsecurity } onChange={ this.handleChangeDisableWebSecurity } />);
//OSX has an option in the Dock, to set the app to autostart, so we choose to not support this option for OSX
if (process.platform === 'win32' || process.platform === 'linux') {