Merge branch 'master' into dev

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({

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

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