From 227bda3a935c8056a552d933049e4981018e1577 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Wed, 13 Jul 2016 00:41:31 +0900
Subject: [PATCH 1/2] Fix authentication dialog not working for proxy

---
 src/browser/components/loginModal.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/components/loginModal.jsx b/src/browser/components/loginModal.jsx
index 45f32fd2..64337272 100644
--- a/src/browser/components/loginModal.jsx
+++ b/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}`;
     }

From cddd85e7fbc41dc1c643d0e8ae23894b3fe6529f Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Wed, 13 Jul 2016 00:43:05 +0900
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7eebaec..f598cb76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,7 +46,7 @@ Expected release date: 2016-07-16
 - Added **Add** button next to the "Teams" label on the Settings page.
 - Added **Edit** button on the team list on the Settings page.
 - Added **Help** to the Menu Bar, which includes
-    - Link to [**Mattermost Docs**](docs.mattermost.com) 
+    - Link to [**Mattermost Docs**](docs.mattermost.com)
     - Field to indicate the application version number.
 
 ### Other Changes
@@ -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.