From 0c701cc1d02c3d3b630050a0547f9dc632596013 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 9 May 2017 16:00:40 -0400
Subject: PLT-6518 Fixed user's locale not being loaded with redux actions
 (#6359)

* Stopped ManageLanguages component from mutating user

* Removed obsolete reference to mm_user

* PLT-6518 Fixed user's locale not being loaded with redux actions
---
 webapp/components/login/login_controller.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webapp/components/login/login_controller.jsx')

diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index fa3412f34..04ba46896 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -210,7 +210,7 @@ export default class LoginController extends React.Component {
 
     finishSignin(team) {
         const query = this.props.location.query;
-        GlobalActions.loadDefaultLocale();
+        GlobalActions.loadCurrentLocale();
         if (query.redirect_to) {
             browserHistory.push(query.redirect_to);
         } else if (team) {
-- 
cgit v1.2.3-1-g7c22


From b868aa1dc7af16ddea8f65ed60683a6f440567ec Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmood@users.noreply.github.com>
Date: Wed, 10 May 2017 18:48:22 +0500
Subject: Fixes for RC1 (#6376)

* PLT-6505 - Fixing z-index for post control menu

* PLT-6507 - Channel header icons not aligned

* PLT-6508 - Options popover issue on android

* PLT-6528 - Removing cross contamination on badge

* PLT-6535 - Aligning content in SSO buttons

* PLT-6509 - Aligning dropdown close icon
---
 webapp/components/login/login_controller.jsx | 42 +++++++++++++++++-----------
 1 file changed, 25 insertions(+), 17 deletions(-)

(limited to 'webapp/components/login/login_controller.jsx')

diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index 04ba46896..4b6757294 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -493,12 +493,14 @@ export default class LoginController extends React.Component {
                     key='gitlab'
                     href={Client.getOAuthRoute() + '/gitlab/login' + this.props.location.search}
                 >
-                    <span className='icon'/>
                     <span>
-                        <FormattedMessage
-                            id='login.gitlab'
-                            defaultMessage='GitLab'
-                        />
+                        <span className='icon'/>
+                        <span>
+                            <FormattedMessage
+                                id='login.gitlab'
+                                defaultMessage='GitLab'
+                            />
+                        </span>
                     </span>
                 </a>
             );
@@ -511,12 +513,14 @@ export default class LoginController extends React.Component {
                     key='google'
                     href={Client.getOAuthRoute() + '/google/login' + this.props.location.search}
                 >
-                    <span className='icon'/>
                     <span>
-                        <FormattedMessage
-                            id='login.google'
-                            defaultMessage='Google Apps'
-                        />
+                        <span className='icon'/>
+                        <span>
+                            <FormattedMessage
+                                id='login.google'
+                                defaultMessage='Google Apps'
+                            />
+                        </span>
                     </span>
                 </a>
             );
@@ -529,12 +533,14 @@ export default class LoginController extends React.Component {
                     key='office365'
                     href={Client.getOAuthRoute() + '/office365/login' + this.props.location.search}
                 >
-                    <span className='icon'/>
                     <span>
-                        <FormattedMessage
-                            id='login.office365'
-                            defaultMessage='Office 365'
-                        />
+                        <span className='icon'/>
+                        <span>
+                            <FormattedMessage
+                                id='login.office365'
+                                defaultMessage='Office 365'
+                            />
+                        </span>
                     </span>
                 </a>
             );
@@ -547,9 +553,11 @@ export default class LoginController extends React.Component {
                     key='saml'
                     href={'/login/sso/saml' + this.props.location.search}
                 >
-                    <span className='icon fa fa-lock fa--margin-top'/>
                     <span>
-                        {global.window.mm_config.SamlLoginButtonText}
+                        <span className='icon fa fa-lock fa--margin-top'/>
+                        <span>
+                            {global.window.mm_config.SamlLoginButtonText}
+                        </span>
                     </span>
                 </a>
             );
-- 
cgit v1.2.3-1-g7c22