Merge branch 'release-4.1' into issue-780

CHANGELOG.md

@@ -48,6 +48,8 @@ Release date: TBD
 [#708](https://github.com/mattermost/desktop/issues/708)
 - Fixed an issue where the main screen opens a blank page when a tab is dropped into the screen.
 [#667](https://github.com/mattermost/desktop/issues/667)
+- Fixed "Save Image" context menu not working.
+[#707](https://github.com/mattermost/desktop/issues/707)
 - Fixed an issue that prevented typing in the form fields on the add server dialog when launched from the tab bar.
 [#780](https://github.com/mattermost/desktop/issues/780)
 

src/browser/components/TabBar.jsx

@@ -61,7 +61,12 @@ export default class TabBar extends React.Component { // need "this"
           ref={id}
           draggable={false}
         >
-          <span title={team.name} className={unreadCount === 0 ? '' : 'teamTabItem-unread'}>{team.name}</span>
+          <span
+            title={team.name}
+            className={unreadCount === 0 ? '' : 'teamTabItem-unread'}
+          >
+            {team.name}
+          </span>
           { ' ' }
           { badgeDiv }
           {permissionOverlay}

src/package.json

@@ -12,7 +12,7 @@
     "auto-launch": "^5.0.5",
     "bootstrap": "^3.3.7",
     "create-react-class": "^15.6.3",
-    "electron-context-menu": "^0.9.0",
+    "electron-context-menu": "0.9.0",
     "electron-devtools-installer": "^2.2.3",
     "electron-is-dev": "^0.3.0",
     "electron-squirrel-startup": "^1.0.0",

src/yarn.lock

@@ -137,9 +137,9 @@ dom-helpers@^3.2.0, dom-helpers@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
 
-electron-context-menu@^0.9.0:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-0.9.1.tgz#ed4df20c080491c3c996abfcb363159946a38058"
+electron-context-menu@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-0.9.0.tgz#8a66bef502f0524255a1350a2b4704dbaacfd503"
   dependencies:
     electron-dl "^1.2.0"
     electron-is-dev "^0.1.1"