Merge branch 'master' into dev

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

docs/setup.md

@@ -9,11 +9,16 @@ To set up the Mattermost desktop application for Windows 7, 8 and 10:
 
    Find the file ending in `-win64.zip` if you're running a x64 version of Windows and `-win32.zip` if you're running an older 32-bit version.
 
-2. From the `/Downloads` directory right-click on the file and select "Extract All..."
+2. From the `\Downloads` directory right-click on the file and select "Extract All..."
 
-   A new directory should be created on your PC.
+   - Change the extract folder from `C:\Users\(currentuser)\Downloads\mattermost-desktop-1.1.1-win64` to `C:\Users\(currentuser)\AppData\Local` where `(currentuser)` will be the name of your user account.
+   - Check the "Show extracted files when complete" checkbox.
+   - Click the "Extract" button.
+   - Look for the new application directory at `C:\Users\(currentuser)\AppData\Local\mattermost-desktop...`.
+   - Remove the version number by renaming the `mattermost-desktop...` application directory to `mattermost-desktop`.
+   - If a `mattermost-desktop` directory already exists then you are upgrading Mattermost, and need to quit Mattermost if it is running and then delete the `mattermost-desktop` directory. After that you can rename the `mattermost-desktop...` directory to `mattermost-desktop`. Don't worry, no settings will be lost, they are stored elsewhere.
 
-3. Go to `/mattermost-desktop...` directory and find the file named `Mattermost`
+3. Go to the `\mattermost-desktop` application directory and find the file named `Mattermost`.
 
    - Right-click the file and select "Pin to Taskbar" to make the application available from your Windows task bar.
    - Right-click the file and select "Pin to Start Menu" to make the application available from your Windows Start menu.
@@ -119,7 +124,7 @@ The Settings Page is available from the **File** menu under **Settings** (Click
 
 ## Menu Bar
 
-Click the `Alt` key to toggle the menu on and off.
+If **Hide Menu Bar** option is enabled, click the `Alt` key to toggle the menu on and off.
 
 Below lists menu options (shortcut keys are listed in brackets, `Ctrl` becomes `Command` on OS X):
 

gulpfile.js

@@ -192,8 +192,8 @@ function makePackage(platform, arch, callback) {
     "app-version": packageJson.version,
     icon: 'resources/icon',
     "version-string": {
-      CompanyName: packageJson.author,
-      LegalCopyright: 'Copyright (c) 2015 ' + packageJson.author,
+      CompanyName: packageJson.author.name,
+      LegalCopyright: 'Copyright (c) 2015 ' + packageJson.author.name,
       FileDescription: packageJson.description,
       OriginalFilename: packageJson.productName + '.exe',
       ProductVersion: packageJson.version,

package.json

@@ -1,10 +1,13 @@
 {
   "name": "mattermost-desktop",
   "productName": "Mattermost",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
-  "author": "Yuya Ochiai <yuya0321@gmail.com>",
+  "author": {
+    "name": "Yuya Ochiai",
+    "email": "yuya0321@gmail.com"
+  },
   "license": "MIT",
   "engines": {
     "node": ">=4.2.0"
@@ -32,8 +35,8 @@
     "del": "^2.2.0",
     "electron-builder": "^3.11.0",
     "electron-connect": "^0.3.7",
-    "electron-packager": "^5.1.0",
-    "electron-prebuilt": "0.37.7",
+    "electron-packager": "^7.0.1",
+    "electron-prebuilt": "0.37.8",
     "esformatter": "^0.9.3",
     "esformatter-jsx": "^5.0.0",
     "gulp": "^3.9.0",

src/browser/settings.jsx

@@ -88,7 +88,7 @@ var SettingsPage = React.createClass({
       options.push(<Input key="inputShowTrayIcon" ref="showTrayIcon" type="checkbox" label="Show Icon on Menu Bar (Need to restart the application)" checked={ this.state.showTrayIcon } onChange={ this.handleChangeShowTrayIcon }
                    />);
     }
-    options.push(<Input key="inputDisableWebSecurity" ref="disablewebsecurity" type="checkbox" label="Allow insecure contents (This allows not only insecure images, but also insecure scripts)"
+    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.)"
                    checked={ this.state.disablewebsecurity } onChange={ this.handleChangeDisableWebSecurity } />);
     var options_row = (options.length > 0) ? (
       <Row>

src/common/settings.js

@@ -24,7 +24,7 @@ var loadDefault = function(version) {
         teams: [],
         hideMenuBar: false,
         showTrayIcon: false,
-        disablewebsecurity: false,
+        disablewebsecurity: true,
         version: 1
       };
   }

src/package.json

@@ -1,10 +1,13 @@
 {
   "name": "mattermost-desktop",
   "productName": "Mattermost",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
-  "author": "Yuya Ochiai <yuya0321@gmail.com>",
+  "author": {
+    "name": "Yuya Ochiai",
+    "email": "yuya0321@gmail.com"
+  },
   "license": "MIT",
   "devDependencies": {
     "electron-connect": "^0.3.3"