Merge branch 'release-3.6'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mattermost-desktop",
   "productName": "Mattermost",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "Mattermost",
   "main": "main.js",
   "author": {

src/browser/components/MattermostView.jsx

@@ -72,7 +72,7 @@ const MattermostView = React.createClass({
       }
       if (currentURL.host === destURL.host) {
         // New window should disable nodeIntergration.
-        window.open(e.url, 'Mattermost', 'nodeIntegration=no');
+        window.open(e.url, 'Mattermost', 'nodeIntegration=no, show=yes');
       } else {
         // if the link is external, use default browser.
         shell.openExternal(e.url);

src/browser/components/SettingsPage.jsx

@@ -58,6 +58,9 @@ const SettingsPage = React.createClass({
         showAddTeamForm: true
       });
     });
+    ipcRenderer.on('switch-tab', (event, key) => {
+      backToIndex(key);
+    });
   },
 
   setSavingState(state) {
@@ -284,6 +287,7 @@ const SettingsPage = React.createClass({
       </Checkbox>);
 
     if (process.platform === 'darwin' || process.platform === 'win32') {
+      const TASKBAR = process.platform === 'win32' ? 'taskbar' : 'Dock';
       options.push(
         <Checkbox
           key='inputShowUnreadBadge'
@@ -291,9 +295,9 @@ const SettingsPage = React.createClass({
           ref='showUnreadBadge'
           checked={this.state.showUnreadBadge}
           onChange={this.handleShowUnreadBadge}
-        >{'Show red badge on taskbar icon to indicate unread messages'}
+        >{`Show red badge on ${TASKBAR} icon to indicate unread messages`}
           <HelpBlock>
-            {'Regardless of this setting, mentions are always indicated with a red badge and item count on the taskbar icon.'}
+            {`Regardless of this setting, mentions are always indicated with a red badge and item count on the ${TASKBAR} icon.`}
           </HelpBlock>
         </Checkbox>);
     }
@@ -306,9 +310,9 @@ const SettingsPage = React.createClass({
           ref='flashWindow'
           checked={this.state.notifications.flashWindow === 2}
           onChange={this.handleFlashWindow}
-        >{'Flash taskbar icon when a new message is received'}
+        >{'Flash app window and taskbar icon when a new message is received'}
           <HelpBlock>
-            {'If enabled, taskbar icon flashes for a few seconds when a new message is received.'}
+            {'If enabled, app window and taskbar icon flash for a few seconds when a new message is received.'}
           </HelpBlock>
         </Checkbox>);
     }

src/package.json

@@ -2,7 +2,7 @@
   "name": "mattermost-desktop",
   "productName": "Mattermost",
   "desktopName": "Mattermost.desktop",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "Mattermost",
   "main": "main.js",
   "author": {

test/specs/browser/settings_test.js

@@ -202,7 +202,7 @@ describe('browser/settings.html', function desc() {
       });
     });
 
-    describe('Flash taskbar icon when a new message is received', () => {
+    describe('Flash app window and taskbar icon when a new message is received', () => {
       it('should appear on win32 and linux', () => {
         const expected = (process.platform === 'win32' || process.platform === 'linux');
         env.addClientCommands(this.app.client);