diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a5c5fab..7dc1c5cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ This release contains a security update and it is highly recommended that users ### Improvements - Improve the style for tab badges. -- Add **Allow insecure contents** option to render images with `http://`. +- Add **Allow mixed content** option to render images with `http://`. - Add the login dialog for http authentication. #### OS X diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx index 1237c61e..ca3ec978 100644 --- a/src/browser/settings.jsx +++ b/src/browser/settings.jsx @@ -88,7 +88,7 @@ var SettingsPage = React.createClass({ options.push(); } - options.push(); var options_row = (options.length > 0) ? ( diff --git a/src/common/settings.js b/src/common/settings.js index 14dcdee0..5739c71e 100644 --- a/src/common/settings.js +++ b/src/common/settings.js @@ -24,7 +24,7 @@ var loadDefault = function(version) { teams: [], hideMenuBar: false, showTrayIcon: false, - disablewebsecurity: false, + disablewebsecurity: true, version: 1 }; }