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

Merge branch 'fix-auth-for-proxy'

Browse source 
Close #197
This commit is contained in:
Yuya Ochiai 2016-07-13 00:45:11 +09:00
parent f7ba831eaf cddd85e7fb
commit ffa7ccab7c
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -54,6 +54,9 @@ Expected release date: 2016-07-16
### Bug Fixes ### Bug Fixes
#### All platforms
- Fixed authentication dialog not working for proxy.
#### Windows #### Windows
- Fixed the pixelated app icon on the top left of the main window. - Fixed the pixelated app icon on the top left of the main window.
- Fixed the blurred system tray icon. - Fixed the blurred system tray icon.

2
src/browser/components/loginModal.jsx
View file

@ -24,7 +24,7 @@ const LoginModal = React.createClass({
if (!this.props.show) { if (!this.props.show) {
theServer = ''; theServer = '';
} else if (this.props.authInfo.isProxy) { } else if (this.props.authInfo.isProxy) {
theServer = `The proxy ${authInfo.host}:${authInfo.port}`; theServer = `The proxy ${this.props.authInfo.host}:${this.props.authInfo.port}`;
} else { } else {
theServer = `The server ${this.props.authServerURL}`; theServer = `The server ${this.props.authServerURL}`;
} }