Merge branch 'master' into dev

n0iz · Apr 14, 2016 · c378344 · c378344
2 parents 3097da1 + af48bce
commit c378344
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Mattermost Desktop Application Changelog
 
+
 ## Release v1.2.0 (Beta)
 
 ### Improvements
@@ -8,8 +9,21 @@
 - Add the option to show the icon on menu bar
 
 
+## 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.
 
 
@@ -21,9 +35,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

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1 @@
+- [ ] Did you read `CONTRIBUTING.md`?
diff --git 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
@@ -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",
@@ -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.37.3",
     "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"
   }
 }
diff --git 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({

diff --git 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',

diff --git 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",