Merge branch 'release-3.4'

docs/setup.md

@@ -153,7 +153,6 @@ Below lists menu options (shortcut keys are listed in brackets, `Ctrl` becomes `
   - **Paste** (Ctrl+V) - Pastes text from clipboard
   - **Select All** (Ctrl+A) - Select all text in input box
   - **Search in Team** (Ctrl+S) - Puts cursor in search box to search in the current team
-  - **Search in Channel** (Shift+Ctrl+S) - Puts cursor in search box to search in current channel
 - **View**
   - **Reload** (Ctrl+R) - Reload page from the server
   - **Clear Cache and Reload** (Ctrl+Shift+R) - Clear cached content in application and reload page
@@ -172,7 +171,7 @@ Below lists menu options (shortcut keys are listed in brackets, `Ctrl` becomes `
   - **Select Next Team** (Ctrl+Tab, Alt+Command+Right) - Open the right tab
   - **Select Previous Team** (Ctrl+Shift+Tab, Alt+Command+Left) - Open the left tab
 - **Help**
-  - ***Mattermost Docs*** Links to the official mattermost documentation
+  - ***Learn More*** Links to the official mattermost documentation
   - ***Version*** Indicate the application version
 
 

gulpfile.js

@@ -221,7 +221,7 @@ function makePackage(platform, arch, callback) {
       callback(err);
     }
     else {
-      if (arch === 'linux' || arch === 'all') {
+      if (platform === 'linux' || platform === 'all') {
         const dest_32 = 'release/Mattermost-linux-ia32';
         const dest_64 = 'release/Mattermost-linux-x64';
         fs.createReadStream('resources/icon.png').pipe(fs.createWriteStream(`${dest_32}/icon.png`));

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "mattermost-desktop",
+  "name": "mattermost",
   "productName": "Mattermost",
-  "version": "1.4.0",
+  "version": "3.4.0",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
   "author": {

src/browser/js/notification.js

@@ -52,7 +52,7 @@ function override(eventHandlers) {
     defineReadProperty(event);
     Notification.prototype.__defineSetter__(event, function(originalCallback) {
       this.notification[event] = function() {
-        callbackevent = {
+        const callbackevent = {
           preventDefault: function() {
             this.isPrevented = true;
           }

src/browser/settings.jsx

@@ -209,6 +209,15 @@ var SettingsPage = React.createClass({
       navbar: {
         backgroundColor: '#fff'
       },
+      close: {
+        position: 'absolute',
+        right: '0',
+        top: '10px',
+        fontSize: '35px',
+        fontWeight: 'normal',
+        color: '#bbb',
+        cursor: 'pointer'
+      },
       heading: {
         textAlign: 'center',
         fontSize: '24px',
@@ -242,9 +251,14 @@ var SettingsPage = React.createClass({
     return (
       <div>
         <Navbar className="navbar-fixed-top" style={ settingsPage.navbar }>
-          <h1 style={ settingsPage.heading }>Settings</h1>
+          <div style={ { 'position': 'relative' } }>
+            <h1 style={ settingsPage.heading }>Settings</h1>
+            <div style={ settingsPage.close } onClick={ this.handleCancel }>
+              <span>×</span>
+            </div>
+          </div>
         </Navbar>
-        <Grid className="settingsPage" style={ { 'padding-top': '100px', 'padding-bottom': '70px' } }>
+        <Grid className="settingsPage" style={ { 'padding': '100px 15px' } }>
           <Row>
             <Col md={ 10 } xs={ 8 }>
             <h2 style={ settingsPage.sectionHeading }>Team Management</h2>
@@ -256,9 +270,6 @@ var SettingsPage = React.createClass({
           { teams_row }
           <hr/>
           { options_row }
-          <div>
-            <hr />
-          </div>
         </Grid>
         <Navbar className="navbar-fixed-bottom">
           <div className='text-right' style={ settingsPage.footer }>

src/main.js

@@ -17,19 +17,31 @@ process.on('uncaughtException', (error) => {
 
 if (process.platform === 'win32') {
   var cmd = process.argv[1];
+  var AutoLaunch = require('auto-launch');
+  var appLauncher = new AutoLaunch({
+    name: 'Mattermost',
+    isHidden: true
+  });
   if (cmd === '--squirrel-uninstall') {
-    var AutoLaunch = require('auto-launch');
-    var appLauncher = new AutoLaunch({
-      name: 'Mattermost',
-      isHidden: true
-    });
+    // If we're uninstalling, make sure we also delete our auto launch registry key
     appLauncher.isEnabled().then(function(enabled) {
       if (enabled)
         appLauncher.disable();
     });
   }
+  else if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') {
+    // If we're updating and already have an registry entry for auto launch, make sure to update the path
+    appLauncher.isEnabled().then(function(enabled) {
+      if (enabled) {
+        return appLauncher.disable().then(function() {
+          return appLauncher.enable();
+        });
+      }
+    });
+  }
 }
 
+app.setAppUserModelId('com.squirrel.mattermost.Mattermost'); // Use explicit AppUserModelID
 require('electron-squirrel-startup');
 
 const fs = require('fs');

src/main/menus/app.js

@@ -36,7 +36,7 @@ var createTemplate = function(mainWindow, config) {
   }, separatorItem, {
     role: 'quit'
   }] : [{
-    label: 'Settings',
+    label: 'Settings...',
     accelerator: 'CmdOrCtrl+,',
     click: function(item, focusedWindow) {
       mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
@@ -77,14 +77,6 @@ var createTemplate = function(mainWindow, config) {
           focusedWindow.webContents.send('activate-search-box');
         }
       }
-    }, {
-      label: 'Search in Channel',
-      accelerator: 'Shift+CmdOrCtrl+S',
-      click: (item, focusedWindow) => {
-        if (focusedWindow) {
-          focusedWindow.webContents.send('activate-search-box-in-channel');
-        }
-      }
     }]
   });
   template.push({
@@ -229,9 +221,9 @@ var createTemplate = function(mainWindow, config) {
   template.push({
     label: '&Help',
     submenu: [{
-      label: `${app_name} Docs`,
+      label: `Learn More...`,
       click: function() {
-        electron.shell.openExternal('http://docs.mattermost.com');
+        electron.shell.openExternal('https://docs.mattermost.com/help/apps/desktop-guide.html');
       }
     }, {
       type: 'separator'

src/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "mattermost-desktop",
+  "name": "mattermost",
   "productName": "Mattermost",
   "desktopName": "Mattermost.desktop",
-  "version": "1.4.0",
+  "version": "3.4.0",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
   "author": {