Merging release branch 'release-0.7.0'

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>

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');

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)
         );
     },