From e3b9cc43fd346bb3da17d3bb5b6031f1b5488bae Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Tue, 22 May 2018 23:50:45 +0900
Subject: [PATCH 1/4] Fix authentication dialog not working

---
 src/browser/components/LoginModal.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/browser/components/LoginModal.jsx b/src/browser/components/LoginModal.jsx
index 78edb173..da4c9f16 100644
--- a/src/browser/components/LoginModal.jsx
+++ b/src/browser/components/LoginModal.jsx
@@ -51,6 +51,9 @@ export default class LoginModal extends React.Component {
                   type='text'
                   placeholder='User Name'
                   ref='username'
+                  onClick={(e) => {
+                    e.stopPropagation();
+                  }}
                 />
               </Col>
             </FormGroup>
@@ -64,6 +67,9 @@ export default class LoginModal extends React.Component {
                   type='password'
                   placeholder='Password'
                   ref='password'
+                  onClick={(e) => {
+                    e.stopPropagation();
+                  }}
                 />
               </Col>
             </FormGroup>

From b733c3e18b03f14d96a824317172d95ed5ffc14f Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Thu, 24 May 2018 00:33:28 +0900
Subject: [PATCH 2/4] Update version to 4.1.2

---
 package.json     | 2 +-
 src/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0e1caa13..6c0d090b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mattermost-desktop",
   "productName": "Mattermost",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Mattermost",
   "main": "main.js",
   "author": "Mattermost, Inc. <feedback@mattermost.com>",
diff --git a/src/package.json b/src/package.json
index 5dc380b3..61db93ee 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,7 +2,7 @@
   "name": "mattermost-desktop",
   "productName": "Mattermost",
   "desktopName": "Mattermost.desktop",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Mattermost",
   "main": "main_bundle.js",
   "author": "Mattermost, Inc. <feedback@mattermost.com>",

From 3a3770fcb845d608f969ff7d456168e9cf98c041 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Thu, 24 May 2018 00:32:34 +0900
Subject: [PATCH 3/4] Update CHANGELOG.md

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0a73729..39a3006b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Mattermost Desktop Application Changelog
 
+## Release v4.1.2
+
+Release date: May 25, 2018
+
+### Bug Fixes
+
+#### All Platforms
+ - Fixed authentication dialog not working.
+ [#809](https://github.com/mattermost/desktop/issues/809)
+
+---
+
 ## Release v4.1.1
 
 Release date: May 17, 2018

From 66c5f30d7ff23016a0e2588ee073010a3c35be1b Mon Sep 17 00:00:00 2001
From: amyblais <amy_blais@hotmail.com>
Date: Thu, 24 May 2018 09:29:03 -0400
Subject: [PATCH 4/4] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39a3006b..2d2b79ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ Release date: May 25, 2018
 ### Bug Fixes
 
 #### All Platforms
- - Fixed authentication dialog not working.
+ - Fixed an issue where the popup dialog to authenticate a user to their proxy or server didn't work.
  [#809](https://github.com/mattermost/desktop/issues/809)
 
 ---