aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release-4.1' into issue-780

Browse source
This commit is contained in:
Yuya Ochiai 2018-04-30 21:32:30 +09:00 committed by GitHub
parent e8444a6ef3 495acff82b
commit 46d10e9f74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -48,6 +48,8 @@ Release date: TBD
[#708](https://github.com/mattermost/desktop/issues/708) [#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. - 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) [#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. - 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) [#780](https://github.com/mattermost/desktop/issues/780)

7
src/browser/components/TabBar.jsx
View file

@ -61,7 +61,12 @@ export default class TabBar extends React.Component { // need "this"
ref={id} ref={id}
draggable={false} 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 } { badgeDiv }
{permissionOverlay} {permissionOverlay}

2
src/package.json
View file

@ -12,7 +12,7 @@
"auto-launch": "^5.0.5", "auto-launch": "^5.0.5",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"create-react-class": "^15.6.3", "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-devtools-installer": "^2.2.3",
"electron-is-dev": "^0.3.0", "electron-is-dev": "^0.3.0",
"electron-squirrel-startup": "^1.0.0", "electron-squirrel-startup": "^1.0.0",

6
src/yarn.lock
View file

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