diff --git a/CHANGELOG.md b/CHANGELOG.md
index abdb4e34..2d1990b6 100644
--- a/CHANGELOG.md
+++ b/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.
diff --git a/LICENSE b/LICENSE
index 96bac019..1170be6b 100644
--- a/LICENSE
+++ b/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
-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:
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+ 1. Definitions.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-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.
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+ "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.
diff --git a/README.md b/README.md
index baee5ff9..fd9b8bcc 100644
--- a/README.md
+++ b/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).
diff --git a/circle/make_draft.sh b/circle/make_draft.sh
index dd0d7373..a9a1fe2f 100755
--- a/circle/make_draft.sh
+++ b/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-amd64 release/mattermost-desktop-$RELEASE_TAG-amd64.deb
+upload mattermost-desktop-$RELEASE_TAG-linux-i386.deb release/mattermost-desktop-$RELEASE_TAG-i386.deb
+upload mattermost-desktop-$RELEASE_TAG-linux-amd64.deb release/mattermost-desktop-$RELEASE_TAG-amd64.deb
diff --git a/docs/setup.md b/docs/setup.md
index 0bd92006..0788719c 100644
--- a/docs/setup.md
+++ b/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.
diff --git a/gulpfile.js b/gulpfile.js
index c789e963..2c3aa24d 100644
--- a/gulpfile.js
+++ b/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,
diff --git a/package.json b/package.json
index 5e437366..56997e45 100644
--- a/package.json
+++ b/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"
}
diff --git a/script/installer.js b/script/installer.js
new file mode 100644
index 00000000..f96ab5d1
--- /dev/null
+++ b/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()
+ })
+ })
+}
diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 1a252b9f..83b4bca4 100644
--- a/src/browser/index.jsx
+++ b/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());
- sendBadge(dataURL, 'You have unread mention (' + mentionCount + ')');
+ const dataURL = badge.createDataURL(mentionCount.toString(), "#FF1744", "#580817"); // Material Red A400
+ sendBadge(dataURL, 'You have unread mentions (' + mentionCount + ')');
} else if (unreadCount > 0) {
- const dataURL = badge.createDataURL('•');
- sendBadge(dataURL, 'You have unread channels');
+ const dataURL = badge.createDataURL('•', "#00e5ff", "#06545D"); // Material Cyan A400
+ sendBadge(dataURL, 'You have unread channels (' + unreadCount + ')');
} else {
sendBadge(null, 'You have no unread messages');
}
diff --git a/src/browser/js/badge.js b/src/browser/js/badge.js
index 0b0b168e..9cf48dba 100644
--- a/src/browser/js/badge.js
+++ b/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"
diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index 99ec2e10..bf043d62 100644
--- a/src/browser/settings.jsx
+++ b/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);
- backToIndex();
+
+ 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 = (