From 99865933ef333387995de4f8d0ddebcc8309c7d3 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 31 Aug 2015 14:06:14 -0400
Subject: Fix missing forgot password link.

---
 web/react/components/login.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 0f3aa42db..28dd64c39 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -152,7 +152,6 @@ export default class Login extends React.Component {
             );
         }
 
-        var forgotPassword;
         if (loginMessage.length > 0 && emailSignup) {
             loginMessage = (
                 <div>
@@ -162,7 +161,10 @@ export default class Login extends React.Component {
                     </div>
                 </div>
             );
+        }
 
+        var forgotPassword;
+        if (emailSignup) {
             forgotPassword = (
                 <div className='form-group'>
                     <a href={'/' + teamName + '/reset_password'}>I forgot my password</a>
-- 
cgit v1.2.3-1-g7c22


From 7de7de6ad0882ef25ed9be5bbd91576cc822206f Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 31 Aug 2015 13:33:22 -0700
Subject: MM-2056 fixes problem with creating team

---
 web/react/components/team_signup_password_page.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/react/components/team_signup_password_page.jsx b/web/react/components/team_signup_password_page.jsx
index bbe82a5c2..6b21915f6 100644
--- a/web/react/components/team_signup_password_page.jsx
+++ b/web/react/components/team_signup_password_page.jsx
@@ -57,13 +57,14 @@ module.exports = React.createClass({
                             window.location.href = '/verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name);
                         } else {
                             this.setState({serverError: err.message});
+                            $('#finish-button').button('reset');
                         }
                     }.bind(this)
                 );
             }.bind(this),
             function error(err) {
                 this.setState({serverError: err.message});
-                $('#sign-up-button').button('reset');
+                $('#finish-button').button('reset');
             }.bind(this)
         );
     },
-- 
cgit v1.2.3-1-g7c22


From 0141c351ca45039d56a892d8b25026252aabd06c Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Mon, 31 Aug 2015 19:23:09 +0500
Subject: MM-2046 - Updating momentum scroll on IOS

---
 web/sass-files/sass/partials/_post.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 0605e9c3b..231e6fe3f 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -139,6 +139,7 @@ body.ios {
 		width: 100%;
 		padding: 1em 0 0;
 		position: relative;
+		-webkit-overflow-scrolling: touch;
 		&.hide-scroll::-webkit-scrollbar {
 			width: 0px !important;
 		}
-- 
cgit v1.2.3-1-g7c22


From 8d6c35481124d7e30bdb559f440c48b3e5eb4e0d Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Mon, 31 Aug 2015 19:33:39 +0500
Subject: Also updating the position of the bottom unread indicator

---
 web/react/components/sidebar.jsx                 | 1 -
 web/sass-files/sass/partials/_sidebar--left.scss | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 8dd192893..5b74165f3 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -278,7 +278,6 @@ module.exports = React.createClass({
             var lastUnreadElement = $(this.refs[this.lastUnreadChannel].getDOMNode());
 
             if (lastUnreadElement.position().top > container.height()) {
-                $(this.refs.bottomUnreadIndicator.getDOMNode()).css('bottom', '0');
                 $(this.refs.bottomUnreadIndicator.getDOMNode()).css('display', 'initial');
             } else {
                 $(this.refs.bottomUnreadIndicator.getDOMNode()).css('display', 'none');
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 6b827eaee..432b8eb46 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -59,7 +59,7 @@
         top: 66px;
     }
     .nav-pills__unread-indicator-bottom {
-        bottom: 0px;
+        bottom: 10px;
     }
 
     .nav {
-- 
cgit v1.2.3-1-g7c22