Merge branch 'master' into dev

CHANGELOG.md

@@ -2,8 +2,11 @@
 
 ## Release v1.3.0 (Beta)
 
+### Changes
+- Changed the license, from MIT License to Apache License, Version 2.0.
+
 ### Improvements
-- Add shortcuts
+- Added shortcuts
   - Zoom
     - Ctrl+0 (View -> Actual Size): Reset the zoom level.
     - Ctrl+Plus (View -> Zoom In)
@@ -15,9 +18,26 @@
     - Ctrl+{1-9} (Window -> *Team name*): Open the *n*-th tab.
     - Ctrl+Tab or Alt+Command+Right (Window -> Select Next Team): Open the right tab.
     - Ctrl+Shift+Tab or Alt+Command+Left (Window -> Select Previous Team): Open the left tab.
+- Added **Add** button next to the "Teams" label on the Setting page.
+- Added **Edit** button on the team list on the Setting page.
+
+#### Windows
+- Added the tooltip for the tray icon in order to show count of unread channels/mantions.
 
 #### Linux
-- Add the option to show the icon on menu bar. (requires libappindicator1 on Ubuntu)
+- Added the option to show the icon on menu bar. (requires libappindicator1 on Ubuntu)
+
+
+## Release v1.2.1 (Beta)
+
+### Fixes
+- Fixed issue to remove "Electron" from appearing in the title bar on startup.
+
+### Improvements
+- Added a dialog to confirm use of non-http(s) protocols prior to opening links. For example, clicking on a link to `file://test` will open a dialog to confirm the user intended to open a file.
+
+#### Windows and OS X
+- Added a right-click menu option for tray icon to open the Desktop application on Windows and OS X.
 
 ### Known issues
 - The shortcuts can't switch teams twice in a raw.

LICENSE

@@ -1,22 +1,203 @@
-The MIT License (MIT)
+Copyright (c) 2015-2016 Yuya Ochiai
 
-Copyright (c) 2015 Yuya Ochiai
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+   1. Definitions.
-copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      "License" shall mean the terms and conditions for use, reproduction,
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      and distribution as defined by Sections 1 through 9 of this document.
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
 
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -86,5 +86,10 @@ $ npm run package:linux
 $ npm run package:all (Packages for all platform)
 ```
 
+Create a windows installer with the following command. It will appear in the `release\windows-installer` directory.
+```
+$ npm run installer
+```
+
 ## Contributing
 Please see [CONTRIBUTING.md](./CONTRIBUTING.md).

circle/make_draft.sh

@@ -52,5 +52,5 @@ deploy win64 zip
 deploy osx tar.gz
 deploy linux-ia32 tar.gz
 deploy linux-x64 tar.gz
-upload mattermost-desktop-$RELEASE_TAG-i386 release/mattermost-desktop-$RELEASE_TAG-i386.deb
+upload mattermost-desktop-$RELEASE_TAG-linux-i386.deb release/mattermost-desktop-$RELEASE_TAG-i386.deb
-upload mattermost-desktop-$RELEASE_TAG-amd64 release/mattermost-desktop-$RELEASE_TAG-amd64.deb
+upload mattermost-desktop-$RELEASE_TAG-linux-amd64.deb release/mattermost-desktop-$RELEASE_TAG-amd64.deb

docs/setup.md

@@ -79,9 +79,11 @@ You have to configure the application to interact with your teams.
    - OS X: Click `Mattermost` from the menu at the top of the screen, then click `Preferences...`.
    - Linux: Click `File -> Settings` on the menu.
 
-2. For each Mattermost team you'd like to use, enter its **Name** and **URL** then click **Add**
+2. Press `+` button next to the "Teams" label.
 
-3. Click **Save** to save your setting
+3. For each Mattermost team you'd like to use, enter its **Name** and **URL** then click **Add**
+
+4. Click **Save** to save your setting
 
 You're now ready to use **Mattermost Desktop** to interact with multiple teams from one desktop application.
 

gulpfile.js

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

package.json

@@ -1,14 +1,14 @@
 {
   "name": "mattermost-desktop",
   "productName": "Mattermost",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
   "author": {
     "name": "Yuya Ochiai",
     "email": "yuya0321@gmail.com"
   },
-  "license": "MIT",
+  "license": "Apache-2.0",
   "engines": {
     "node": ">=4.2.0"
   },
@@ -25,7 +25,8 @@
     "package:osx": "gulp package:osx",
     "package:linux": "gulp build && build --platform linux --arch all -d deb",
     "package:all": "gulp package:all",
-    "prettify": "gulp prettify"
+    "prettify": "gulp prettify",
+    "installer": "node ./script/installer.js"
   },
   "devDependencies": {
     "babel-core": "^6.7.5",
@@ -34,10 +35,12 @@
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
     "del": "^2.2.0",
-    "electron-builder": "^3.11.0",
+    "electron-builder": "3.20.0",
     "electron-connect": "^0.3.7",
     "electron-packager": "^7.0.1",
     "electron-prebuilt": "1.0.2",
+    "electron-squirrel-startup": "^1.0.0",
+    "electron-winstaller": "^2.2.0",
     "esformatter": "^0.9.3",
     "esformatter-jsx": "^5.0.0",
     "gulp": "^3.9.0",
@@ -49,6 +52,7 @@
     "mocha": "^2.3.4",
     "mocha-circleci-reporter": "0.0.1",
     "spectron": "~3.0.0",
+    "rimraf": "^2.5.2",
     "style-loader": "^0.13.0",
     "through2": "^2.0.1",
     "vinyl-named": "^1.1.0",
@@ -56,6 +60,8 @@
     "webpack-stream": "^3.1.0"
   },
   "build": {
+    "app-bundle-id": "com.mattermost.desktop",
+    "app-category-type": "public.app-category.productivity",
     "linux": {
       "synopsis": "Mattermost Desktop"
     }

script/installer.js

@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+
+const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller
+const path = require('path')
+const rimraf = require('rimraf')
+
+deleteOutputFolder()
+  .then(getInstallerConfig)
+  .then(createWindowsInstaller)
+  .catch((error) => {
+    console.error(error.message || error)
+    process.exit(1)
+  })
+
+function getInstallerConfig() {
+  const rootPath = path.join(__dirname, '..')
+  const outPath = path.join(rootPath, 'release')
+
+  return Promise.resolve({
+    appDirectory: path.join(outPath, 'Mattermost-win32-x64'),
+    iconUrl: 'https://raw.githubusercontent.com/mattermost/desktop/master/resources/icon.ico',
+    //loadingGif: path.join(rootPath, 'assets', 'img', 'loading.gif'),
+    noMsi: true,
+    outputDirectory: path.join(outPath, 'windows-installer'),
+    setupExe: 'Mattermost.exe',
+    setupIcon: path.join(rootPath, 'resources', 'icon.ico'),
+    skipUpdateIcon: true,
+    exe: 'Mattermost.exe'
+  })
+}
+
+function deleteOutputFolder() {
+  return new Promise((resolve, reject) => {
+    rimraf(path.join(__dirname, '..', 'out', 'windows-installer'), (error) => {
+      error ? reject(error) : resolve()
+    })
+  })
+}

src/browser/index.jsx

@@ -326,6 +326,7 @@ var MattermostView = React.createClass({
       var currentURL = url.parse(webview.getURL());
       var destURL = url.parse(e.url);
       if (destURL.protocol !== 'http:' && destURL.protocol !== 'https:') {
+        ipcRenderer.send('confirm-protocol', destURL.protocol, e.url);
         return;
       }
       if (currentURL.host === destURL.host) {
@@ -473,11 +474,11 @@ var showUnreadBadgeWindows = function(unreadCount, mentionCount) {
   };
 
   if (mentionCount > 0) {
-    const dataURL = badge.createDataURL(mentionCount.toString());
+    const dataURL = badge.createDataURL(mentionCount.toString(), "#FF1744", "#580817"); // Material Red A400
-    sendBadge(dataURL, 'You have unread mention (' + mentionCount + ')');
+    sendBadge(dataURL, 'You have unread mentions (' + mentionCount + ')');
   } else if (unreadCount > 0) {
-    const dataURL = badge.createDataURL('•');
+    const dataURL = badge.createDataURL('•', "#00e5ff", "#06545D"); // Material Cyan A400
-    sendBadge(dataURL, 'You have unread channels');
+    sendBadge(dataURL, 'You have unread channels (' + unreadCount + ')');
   } else {
     sendBadge(null, 'You have no unread messages');
   }

src/browser/js/badge.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var createDataURL = function(text) {
+var createDataURL = function(text, color, circleColor) {
   const scale = 2; // should rely display dpi
   const size = 16 * scale;
   const canvas = document.createElement('canvas');
@@ -9,10 +9,13 @@ var createDataURL = function(text) {
   const ctx = canvas.getContext('2d');
 
   // circle
-  ctx.fillStyle = "#FF1744"; // Material Red A400
+  ctx.fillStyle = color;
   ctx.beginPath();
   ctx.arc(size / 2, size / 2, size / 2, 0, Math.PI * 2);
   ctx.fill();
+  ctx.lineWidth = 2;
+  ctx.strokeStyle = circleColor;
+  ctx.stroke();
 
   // text
   ctx.fillStyle = "#ffffff"

src/browser/settings.jsx

@@ -28,14 +28,21 @@ var SettingsPage = React.createClass({
     } catch (e) {
       config = settings.loadDefault();
     }
+
+    this.setState({
+      showAddTeamForm: false
+    });
+
     return config;
   },
   handleTeamsChange: function(teams) {
     this.setState({
       teams: teams
     });
+
+    this.handleSave(false);
   },
-  handleSave: function() {
+  handleSave: function(toIndex) {
     var config = {
       teams: this.state.teams,
       hideMenuBar: this.state.hideMenuBar,
@@ -50,8 +57,12 @@ var SettingsPage = React.createClass({
       currentWindow.setAutoHideMenuBar(config.hideMenuBar);
       currentWindow.setMenuBarVisibility(!config.hideMenuBar);
     }
+
     ipcRenderer.send('update-menu', config);
+
+    if (typeof toIndex == 'undefined' || toIndex) {
       backToIndex();
+    }
   },
   handleCancel: function() {
     backToIndex();
@@ -76,12 +87,27 @@ var SettingsPage = React.createClass({
       trayIconTheme: this.refs.trayIconTheme.getValue()
     });
   },
+  handleShowTeamForm: function() {
+    if (!this.state.showAddTeamForm) {
+      this.setState({
+        showAddTeamForm: true
+      });
+    } else {
+      this.setState({
+        showAddTeamForm: false
+      });
+    }
+  },
   render: function() {
+
+    var buttonStyle = {
+      marginTop: 20
+    };
+
     var teams_row = (
     <Row>
       <Col md={ 12 }>
-      <h2>Teams</h2>
+      <TeamList teams={ this.state.teams } showAddTeamForm={ this.state.showAddTeamForm } onTeamsChange={ this.handleTeamsChange } />
-      <TeamList teams={ this.state.teams } onTeamsChange={ this.handleTeamsChange } />
       </Col>
     </Row>
     );
@@ -114,6 +140,16 @@ var SettingsPage = React.createClass({
 
     return (
       <Grid className="settingsPage">
+        <Row>
+          <Col xs={ 4 } sm={ 1 } md={ 2 } lg={ 2 }>
+          <h2>Teams</h2>
+          </Col>
+          <Col xs={ 4 } sm={ 2 } md={ 1 } lg={ 1 } mdPull={ 1 }>
+          <Button className="pull-right" style={ buttonStyle } bsSize="small" onClick={ this.handleShowTeamForm }>
+            <Glyphicon glyph="plus" />
+          </Button>
+          </Col>
+        </Row>
         { teams_row }
         { options_row }
         <Row>
@@ -129,6 +165,16 @@ var SettingsPage = React.createClass({
 });
 
 var TeamList = React.createClass({
+  getInitialState: function() {
+    return {
+      showTeamListItemNew: false,
+      team: {
+        url: '',
+        name: '',
+        index: false
+      }
+    };
+  },
   handleTeamRemove: function(index) {
     console.log(index);
     var teams = this.props.teams;
@@ -137,23 +183,64 @@ var TeamList = React.createClass({
   },
   handleTeamAdd: function(team) {
     var teams = this.props.teams;
+
+    // check if team already exists and then change existing team or add new one
+    if (!team.index && teams[team.index]) {
+      teams[team.index].name = team.name;
+      teams[team.index].url = team.url;
+    } else {
       teams.push(team);
+    }
+
+    this.setState({
+      showTeamListItemNew: false,
+      team: {
+        url: '',
+        name: '',
+        index: false
+      }
+    });
+
     this.props.onTeamsChange(teams);
   },
+  handleTeamEditing: function(teamName, teamUrl, teamIndex) {
+    this.setState({
+      showTeamListItemNew: true,
+      team: {
+        url: teamUrl,
+        name: teamName,
+        index: teamIndex
+      }
+    })
+  },
   render: function() {
     var thisObj = this;
     var teamNodes = this.props.teams.map(function(team, i) {
       var handleTeamRemove = function() {
         thisObj.handleTeamRemove(i);
       };
+
+      var handleTeamEditing = function() {
+        thisObj.handleTeamEditing(team.name, team.url, i);
+      };
+
       return (
-        <TeamListItem index={ i } key={ "teamListItem" + i } name={ team.name } url={ team.url } onTeamRemove={ handleTeamRemove } />
+        <TeamListItem index={ i } key={ "teamListItem" + i } name={ team.name } url={ team.url } onTeamRemove={ handleTeamRemove } onTeamEditing={ handleTeamEditing }
+        />
         );
     });
+
+    var addTeamForm;
+    if (this.props.showAddTeamForm || this.state.showTeamListItemNew) {
+      addTeamForm = <TeamListItemNew onTeamAdd={ this.handleTeamAdd } teamIndex={ this.state.team.index } teamName={ this.state.team.name } teamUrl={ this.state.team.url } />;
+    } else {
+      addTeamForm = '';
+    }
+
     return (
       <ListGroup class="teamList">
         { teamNodes }
-        <TeamListItemNew onTeamAdd={ this.handleTeamAdd } />
+        { addTeamForm }
       </ListGroup>
       );
   }
@@ -163,6 +250,9 @@ var TeamListItem = React.createClass({
   handleTeamRemove: function() {
     this.props.onTeamRemove();
   },
+  handleTeamEditing: function() {
+    this.props.onTeamEditing();
+  },
   render: function() {
     var style = {
       left: {
@@ -178,6 +268,10 @@ var TeamListItem = React.createClass({
           </p>
         </div>
         <div className="pull-right">
+          <Button bsSize="xsmall" onClick={ this.handleTeamEditing }>
+            <Glyphicon glyph="pencil" />
+          </Button>
+          { ' ' }
           <Button bsSize="xsmall" onClick={ this.handleTeamRemove }>
             <Glyphicon glyph="remove" />
           </Button>
@@ -190,8 +284,9 @@ var TeamListItem = React.createClass({
 var TeamListItemNew = React.createClass({
   getInitialState: function() {
     return {
-      name: '',
+      name: this.props.teamName,
-      url: ''
+      url: this.props.teamUrl,
+      index: this.props.teamIndex
     };
   },
   handleSubmit: function(e) {
@@ -199,9 +294,15 @@ var TeamListItemNew = React.createClass({
     e.preventDefault();
     this.props.onTeamAdd({
       name: this.state.name.trim(),
-      url: this.state.url.trim()
+      url: this.state.url.trim(),
+      index: this.state.index,
+    });
+
+    this.setState({
+      name: '',
+      url: '',
+      index: ''
     });
-    this.setState(this.getInitialState());
   },
   handleNameChange: function(e) {
     console.log('name');
@@ -216,9 +317,23 @@ var TeamListItemNew = React.createClass({
     });
   },
   shouldEnableAddButton: function() {
-    return (this.state.name.trim() !== '') && (this.state.url.trim() !== '');
+    return (this.state.name.trim() !== '' || this.props.teamName !== '')
+      && (this.state.url.trim() !== '' || this.props.teamUrl !== '');
   },
   render: function() {
+
+    var existingTeam = false;
+    if (this.state.name !== '' && this.state.url !== '') {
+      existingTeam = true;
+    }
+
+    var btnAddText;
+    if (existingTeam) {
+      btnAddText = 'Save';
+    } else {
+      btnAddText = 'Add';
+    }
+
     return (
       <ListGroupItem>
         <form className="form-inline" onSubmit={ this.handleSubmit }>
@@ -234,7 +349,9 @@ var TeamListItemNew = React.createClass({
             <input type="url" className="form-control" id="inputTeamURL" placeholder="https://example.com/team" value={ this.state.url } onChange={ this.handleURLChange } />
           </div>
           { ' ' }
-          <Button type="submit" disabled={ !this.shouldEnableAddButton() }>Add</Button>
+          <Button type="submit" disabled={ !this.shouldEnableAddButton() }>
+            { btnAddText }
+          </Button>
         </form>
       </ListGroupItem>
       );

src/main.js

@@ -2,6 +2,9 @@
 
 const electron = require('electron');
 const app = electron.app; // Module to control application life.
+
+if (require('electron-squirrel-startup')) app.quit();
+
 const BrowserWindow = electron.BrowserWindow; // Module to create native browser window.
 const Menu = electron.Menu;
 const Tray = electron.Tray;
@@ -13,6 +16,7 @@ const path = require('path');
 var settings = require('./common/settings');
 var certificateStore = require('./main/certificateStore').load(path.resolve(app.getPath('userData'), 'certificate.json'));
 var appMenu = require('./main/menus/app');
+const allowProtocolDialog = require('./main/allowProtocolDialog');
 
 var argv = require('yargs').argv;
 
@@ -161,6 +165,8 @@ app.on('login', function(event, webContents, request, authInfo, callback) {
   mainWindow.webContents.send('login-request', request, authInfo);
 });
 
+allowProtocolDialog.init(mainWindow);
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 app.on('ready', function() {
@@ -168,11 +174,12 @@ app.on('ready', function() {
     // set up tray icon
     trayIcon = new Tray(trayImages.normal);
     trayIcon.setToolTip(app.getName());
-    var tray_menu = require('./main/menus/tray').createDefault();
-    trayIcon.setContextMenu(tray_menu);
     trayIcon.on('click', function() {
       mainWindow.focus();
     });
+    trayIcon.on('right-click', () => {
+      trayIcon.popUpContextMenu();
+    });
     trayIcon.on('balloon-click', function() {
       mainWindow.focus();
     });
@@ -194,12 +201,15 @@ app.on('ready', function() {
 
       if (arg.mentionCount > 0) {
         trayIcon.setImage(trayImages.mention);
+        trayIcon.setToolTip(arg.mentionCount + ' unread mentions');
       }
       else if (arg.unreadCount > 0) {
         trayIcon.setImage(trayImages.unread);
+        trayIcon.setToolTip(arg.unreadCount + ' unread channels');
       }
       else {
         trayIcon.setImage(trayImages.normal);
+        trayIcon.setToolTip(app.getName());
       }
     });
   }
@@ -218,7 +228,7 @@ app.on('ready', function() {
     // On HiDPI Windows environment, the taskbar icon is pixelated. So this line is necessary.
     window_options.icon = path.resolve(__dirname, 'resources/appicon.png');
   }
-  window_options.fullScreenable = true;
+  window_options.title = app.getName();
   mainWindow = new BrowserWindow(window_options);
   mainWindow.setFullScreenable(true); // fullscreenable option has no effect.
   if (window_options.maximized) {
@@ -238,6 +248,12 @@ app.on('ready', function() {
   });
   ipc.emit('update-menu', true, config);
 
+  // set up context menu for tray icon
+  if (shouldShowTrayIcon()) {
+    const tray_menu = require('./main/menus/tray').createDefault(mainWindow);
+    trayIcon.setContextMenu(tray_menu);
+  }
+
   // Open the DevTools.
   // mainWindow.openDevTools();
 

src/main/allowProtocolDialog.js

@@ -0,0 +1,61 @@
+'use strict';
+
+const {
+  app,
+  dialog,
+  ipcMain
+} = require('electron');
+const path = require('path');
+const fs = require('fs');
+
+const allowedProtocolFile = path.resolve(app.getPath('userData'), 'allowedProtocols.json')
+var allowedProtocols = [];
+
+function init(mainWindow) {
+  fs.readFile(allowedProtocolFile, 'utf-8', (err, data) => {
+    if (!err) {
+      allowedProtocols = JSON.parse(data);
+    }
+    initDialogEvent(mainWindow);
+  });
+}
+
+function initDialogEvent(mainWindow) {
+  ipcMain.on('confirm-protocol', (event, protocol, URL) => {
+    if (allowedProtocols.indexOf(protocol) !== -1) {
+      require('shell').openExternal(URL);
+      return;
+    }
+    dialog.showMessageBox(mainWindow, {
+      title: 'Non http(s) protocol',
+      message: `${protocol} link requires an external application.`,
+      detail: `The requested link is ${URL} . Do you want to continue?`,
+      type: 'warning',
+      buttons: [
+        'Yes',
+        `Yes (Save ${protocol} as allowed)`,
+        'No'
+      ],
+      cancelId: 2,
+      noLink: true
+    }, (response) => {
+      switch (response) {
+        case 1:
+          allowedProtocols.push(protocol);
+          fs.writeFile(allowedProtocolFile, JSON.stringify(allowedProtocols), (err) => {
+            if (err) console.error(err);
+          });
+          // fallthrough
+        case 0:
+          require('shell').openExternal(URL);
+          break;
+        default:
+          break;
+      }
+    });
+  });
+}
+
+module.exports = {
+  init: init
+};

src/main/menus/app.js

@@ -13,6 +13,25 @@ var createTemplate = function(mainWindow, config) {
   var template = [];
 
   const platformAppMenu = process.platform === 'darwin' ? [{
+    label: 'About ' + app_name,
+    role: 'about',
+    click: function(item, focusedWindow) {
+      electron.dialog.showMessageBox(mainWindow, {
+        buttons: ["OK"],
+        message: `${app_name} Desktop ${electron.app.getVersion()}`
+      });
+    }
+  }, {
+    type: 'separator'
+  }, {
+    label: 'Preferences...',
+    accelerator: 'CmdOrCtrl+,',
+    click: function(item, focusedWindow) {
+      mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
+    }
+  }, {
+    type: 'separator'
+  }, {
     label: 'Hide ' + app_name,
     accelerator: 'Command+H',
     selector: 'hide:'
@@ -25,36 +44,33 @@ var createTemplate = function(mainWindow, config) {
     selector: 'unhideAllApplications:'
   }, {
     type: 'separator'
-  }] : [];
+  }, {
-
+    label: 'Quit ' + app_name,
-  template.push({
+    accelerator: 'CmdOrCtrl+Q',
-    label: '&' + first_menu_name,
-    submenu: [{
-      label: 'About ' + app_name,
-      role: 'about',
     click: function(item, focusedWindow) {
-        electron.dialog.showMessageBox(mainWindow, {
+      electron.app.quit();
-          buttons: ["OK"],
-          message: `${app_name} Desktop ${electron.app.getVersion()}`
-        });
     }
-    }, {
+  }] : [{
-      type: 'separator'
+    label: 'Settings',
-    }, {
-      label: (process.platform === 'darwin') ? 'Preferences...' : 'Settings',
     accelerator: 'CmdOrCtrl+,',
     click: function(item, focusedWindow) {
       mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
     }
   }, {
     type: 'separator'
-    }, ...platformAppMenu, {
+  }, {
     label: 'Quit',
     accelerator: 'CmdOrCtrl+Q',
     click: function(item, focusedWindow) {
       electron.app.quit();
     }
-    }]
+  }];
+
+  template.push({
+    label: '&' + first_menu_name,
+    submenu: [
+      ...platformAppMenu
+    ]
   });
   template.push({
     label: '&Edit',
@@ -122,6 +138,8 @@ var createTemplate = function(mainWindow, config) {
           focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
         }
       }
+    }, {
+      type: 'separator'
     }, {
       label: 'Toggle Developer Tools',
       accelerator: (function() {
@@ -205,6 +223,13 @@ var createTemplate = function(mainWindow, config) {
   }
   template.push(window_menu);
 
+  template.push({
+    label: '&Help',
+    submenu: [{
+      label: `Version ${electron.app.getVersion()}`,
+      enabled: false
+    }, ]
+  });
   return template;
 };
 

src/main/menus/tray.js

@@ -1,18 +1,25 @@
 'use strict';
 
-const electron = require('electron');
+const {
-const Menu = electron.Menu;
+  app,
-const MenuItem = electron.MenuItem;
+  Menu,
+  MenuItem
+} = require('electron');
 
-var createDefault = function() {
+function createDefault(mainWindow) {
-  var menu = new Menu();
+  return Menu.buildFromTemplate([{
-  menu.append(new MenuItem({
+    label: `Open ${app.getName()}`,
+    click: () => {
+      mainWindow.show();
+    }
+  }, {
+    type: 'separator'
+  }, {
     label: 'Quit',
     click: function(item) {
-      require('app').quit();
+      app.quit();
     }
-  }));
+  }]);
-  return menu;
 }
 
 module.exports = {

src/package.json

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