From 75fc052e2aa0eaa05a54b23fabb0c06b587949ed Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Mon, 4 Apr 2016 21:18:55 +0900 Subject: [PATCH 1/8] Take care of non-existing directory --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b8621cb..52cde656 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,9 @@ The `electron-mattermost` project is now the official desktop application for th - Rename the executable file from `electron-mattermost` to `Mattermost` - The configuration directory is also different from previous versions. - Should execute following command to take over `config.json`. - - Windows: `copy %APPDATA%\electron-mattermost\config.json %APPDATA%\Mattermost\config.json` - - OS X: `cp ~/Library/Application\ Support/electron-mattermost/config.json ~/Library/Application\ Support/Mattermost/config.json` - - Linux: `cp ~/.config/electron-mattermost/config.json ~/.config/Mattermost/config.json` + - Windows: `mkdir %APPDATA%\Mattermost & copy %APPDATA%\electron-mattermost\config.json %APPDATA%\Mattermost\config.json` + - OS X: `ditto ~/Library/Application\ Support/electron-mattermost/config.json ~/Library/Application\ Support/Mattermost/config.json` + - Linux: `mkdir -p ~/.config/Mattermost && cp ~/.config/electron-mattermost/config.json ~/.config/Mattermost/config.json` ### Improvements From 069f8fa7ac4df0950ef1a927c26cbef889fb5ef7 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Mon, 11 Apr 2016 22:56:37 +0900 Subject: [PATCH 2/8] Create ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..206559ef --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1 @@ +[ ] Did you read `CONTRIBUTING.md`? From c9ab2cdbefd4dee194a831289c41cb10445f87f0 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Mon, 11 Apr 2016 22:58:27 +0900 Subject: [PATCH 3/8] Update ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 206559ef..60007948 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1 +1 @@ -[ ] Did you read `CONTRIBUTING.md`? +- [ ] Did you read `CONTRIBUTING.md`? From 914b782d48556bb53aba625cccf6ff1d623a1c4e Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Mon, 11 Apr 2016 23:07:56 +0900 Subject: [PATCH 4/8] Not allow Alt+Shift to open menu on Cinnamon desktop environment. Close #104 --- src/main/menus/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/menus/app.js b/src/main/menus/app.js index 95ca1b87..efc6f7cc 100644 --- a/src/main/menus/app.js +++ b/src/main/menus/app.js @@ -26,7 +26,7 @@ var createTemplate = function(mainWindow) { }] : []; template.push({ - label: first_menu_name, + label: '&' + first_menu_name, submenu: [{ label: 'About ' + app_name, role: 'about', @@ -50,7 +50,7 @@ var createTemplate = function(mainWindow) { }] }); template.push({ - label: 'Edit', + label: '&Edit', submenu: [{ label: 'Undo', accelerator: 'CmdOrCtrl+Z', @@ -80,7 +80,7 @@ var createTemplate = function(mainWindow) { }, ] }); template.push({ - label: 'View', + label: '&View', submenu: [{ label: 'Reload', accelerator: 'CmdOrCtrl+R', From 51fb43e1a1887e4dcc8462eedc114f7a39bcec12 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Wed, 13 Apr 2016 21:45:51 +0900 Subject: [PATCH 5/8] Fix settings.html doesn't return to index.html Reproduced when the path contains a blank. Escape('%20') has no effects for this, so 'remote' module is used. Close #89 --- src/browser/settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx index 59a08500..84cb9eb6 100644 --- a/src/browser/settings.jsx +++ b/src/browser/settings.jsx @@ -17,7 +17,7 @@ const ListGroupItem = ReactBootstrap.ListGroupItem; const Glyphicon = ReactBootstrap.Glyphicon; function backToIndex() { - window.location = 'index.html'; + remote.getCurrentWindow().loadURL('file://' + __dirname + '/index.html'); } var SettingsPage = React.createClass({ From 0f89418fb0181ebc28890da35e0f807a57b2c87c Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Wed, 13 Apr 2016 23:07:51 +0900 Subject: [PATCH 6/8] Update CHANGELOG.md --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52cde656..50ac1b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,20 @@ # Mattermost Desktop Application Changelog +## Release v1.1.1 (Beta) + +### Fixes + +#### All platforms +- **Settings** page doesn't return to the main page when the located path contains a blank. + +#### Linux +- Alt+Shift opens menu on Cinnamon desktop environment. + + ## Release v1.1.0 (Beta) +- **Released:** 2016-03-30 + The `electron-mattermost` project is now the official desktop application for the Mattermost open source project. From cc2d65c7416ac6443a9402ffdd9e845ae4ac54e5 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Wed, 13 Apr 2016 23:34:50 +0900 Subject: [PATCH 7/8] Fix `npm run build` when using webpack 1.12.15 'remote' module is used in electron-connect but it's removed from electron target on webpack 1.12.15. So define 'remote' as "externals" to avoid bundling error. http://webpack.github.io/docs/configuration.html#externals --- gulpfile.js | 7 +++++-- package.json | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index a8a50002..61ed0d27 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -107,7 +107,7 @@ gulp.task('webpack:browser', function() { __filename: false, __dirname: false }, - target: 'electron' + target: 'electron-renderer' })) .pipe(gulp.dest('dist/browser/')); }); @@ -128,7 +128,10 @@ gulp.task('webpack:main', function() { __filename: false, __dirname: false }, - target: 'electron' + target: 'electron-main', + externals: { + remote: true // for electron-connect + } })) .pipe(gulp.dest('dist/')); }); diff --git a/package.json b/package.json index 3492d439..c5d5b07b 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "babel-preset-react": "^6.3.13", "chromedriver": "^2.20.0", "del": "^2.2.0", - "electron-connect": "^0.3.3", + "electron-connect": "^0.3.7", "electron-packager": "^5.1.0", "electron-prebuilt": "0.36.11", "esformatter": "^0.8.1", @@ -48,6 +48,7 @@ "through2": "^2.0.1", "vinyl-named": "^1.1.0", "webdriverio": "^3.3.0", + "webpack": "^1.12.15", "webpack-stream": "^3.1.0" } } From af48bce17b7e0e84e21b83eef94eee005e9a873a Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Wed, 13 Apr 2016 23:57:16 +0900 Subject: [PATCH 8/8] Update version to 1.1.1 --- package.json | 2 +- src/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c5d5b07b..ea408d26 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "mattermost-desktop", "productName": "Mattermost", - "version": "1.1.0", + "version": "1.1.1", "description": "Mattermost Desktop application for Windows, Mac and Linux", "main": "main.js", "author": "Yuya Ochiai", diff --git a/src/package.json b/src/package.json index 01b7e492..916d1a27 100644 --- a/src/package.json +++ b/src/package.json @@ -1,7 +1,7 @@ { "name": "mattermost-desktop", "productName": "Mattermost", - "version": "1.1.0", + "version": "1.1.1", "description": "Mattermost Desktop application for Windows, Mac and Linux", "main": "main.js", "author": "Yuya Ochiai",