Merge branch 'fix-auth-for-proxy'

Close #197

CHANGELOG.md

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

src/browser/components/loginModal.jsx

@@ -24,7 +24,7 @@ const LoginModal = React.createClass({
     if (!this.props.show) {
       theServer = '';
     } 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 {
       theServer = `The server ${this.props.authServerURL}`;
     }