From 0655c8798fe3402399a2e14ae490f44dccd4641f Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Tue, 16 Jun 2015 07:53:58 -0400
Subject: fixes mm-1251 updates sign up now link

---
 web/react/components/login.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 8d82a4b62..685e1b058 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -74,7 +74,7 @@ var FindTeamDomain = React.createClass({
                     <br/>
                     <br/>
                     <div>
-                        <span>{"Want to create your own " + strings.Team + "?"} <a href="/" className="signup-team-login">Sign up now</a></span>
+                        <span>{"Want to create your own " + strings.Team + "?"} <a href={config.HomeLink} className="signup-team-login">Sign up now</a></span>
                     </div>
                 </form>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 4330537303ee5c8b3b5c82e620b5ec7e002298b4 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Tue, 16 Jun 2015 12:24:51 -0400
Subject: fixes mm-1218 adds sentence describing username to sign up pages

---
 web/react/components/signup_team_complete.jsx | 3 ++-
 web/react/components/signup_user_complete.jsx | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index 066161a10..b038679e6 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -467,7 +467,8 @@ UsernamePage = React.createClass({
                 </div>
                 { name_error }
                 </div>
-                <p>{"Pick something " + strings.Team + "mates will recognize. Your username is how you will appear to others"}</p>
+                <p>{"Pick something " + strings.Team + "mates will recognize. Your username is how you will appear to others."}</p>
+                <p>It can be made of lowercase letters and numbers.</p>
                 <button className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
                 <button className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button>
             </div>
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index 0fcdc92b0..146419cf5 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -120,6 +120,7 @@ module.exports = React.createClass({
                 <img className="signup-team-logo" src="/static/images/logo.png" />
                 <h4>Welcome to { config.SiteName }</h4>
                 <p>{"Choose your username and password for the " + this.props.team_name + " " + strings.Team +"."}</p>
+                <p>Your username can be made of lowercase letters and numbers.</p>
                 <label className="control-label">Username</label>
                 <div className={ name_error ? "form-group has-error" : "form-group" }>
                 <input type="text" ref="name" className="form-control" placeholder="" maxLength="128" />
-- 
cgit v1.2.3-1-g7c22


From eedced16c37248ea02992262ef0a63638db674d0 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 16 Jun 2015 15:35:34 -0400
Subject: Switching from config file to parsing homelink from url

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

(limited to 'web/react/components')

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 685e1b058..103a93bc6 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -74,7 +74,7 @@ var FindTeamDomain = React.createClass({
                     <br/>
                     <br/>
                     <div>
-                        <span>{"Want to create your own " + strings.Team + "?"} <a href={config.HomeLink} className="signup-team-login">Sign up now</a></span>
+                        <span>{"Want to create your own " + strings.Team + "?"} <a href={utils.getHomeLink()} className="signup-team-login">Sign up now</a></span>
                     </div>
                 </form>
             </div>
@@ -188,7 +188,7 @@ module.exports = React.createClass({
                         <a href="/reset_password">I forgot my password</a>
                     </div>
                     <div className="external-link">
-                        <span>{"Want to create your own " + strings.Team + "?"} <a href={config.HomeLink} className="signup-team-login">Sign up now</a></span>
+                        <span>{"Want to create your own " + strings.Team + "?"} <a href={utils.getHomeLink()} className="signup-team-login">Sign up now</a></span>
                     </div>
                 </form>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 20ead3585d77d32862065749bdb25eed9fee0f25 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Wed, 17 Jun 2015 12:25:41 -0400
Subject: fix an auto-complete bug for mentions

---
 web/react/components/textbox.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index 45798809f..7a4762e07 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -204,7 +204,7 @@ module.exports = React.createClass({
 
         // If there is a space after the last @, nothing to do.
         if (lastSpace > atIndex || lastCharSpace > atIndex) {
-            this.setState({ mentionText: '-1' });
+            this.updateMentionTab('-1', null);
             return;
         }
 
-- 
cgit v1.2.3-1-g7c22


From f74ced758f083f6d7b75ad08fe2d18303d0e6465 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 16 Jun 2015 17:08:06 -0700
Subject: Added in basic changes necessary to fix some typos.  Needs further
 tests and changes to other config files

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

(limited to 'web/react/components')

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 103a93bc6..85be3d45b 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -52,20 +52,20 @@ var FindTeamDomain = React.createClass({
                 <div>
                     <span className="signup-team__name">{ config.SiteName }</span>
                     <br/>
-                    <span className="signup-team__subdomain">Enter your {strings.TeamPlural} domain.</span>
+                    <span className="signup-team__subdomain">Enter your {strings.TeamPossessive} domain.</span>
                     <br/>
                     <br/>
                 </div>
                 <form onSubmit={this.handleSubmit}>
                     <div className={server_error ? 'form-group has-error' : 'form-group'}>
                         { server_error }
-                        <input type="text" className="form-control" name="domain" ref="domain" placeholder="teamdomain" />
+                        <input type="text" className="form-control" name="domain" ref="domain" placeholder="team domain" />
                     </div>
                     <div className="form-group">
                         <button type="submit" className="btn btn-primary">Continue</button>
                     </div>
                     <div>
-                        <span>Don't remember your {strings.TeamPlural} domain? <a href="/find_team">Find it here</a></span>
+                        <span>Don't remember your {strings.TeamPossessive} domain? <a href="/find_team">Find it here</a></span>
                     </div>
                     <br/>
                     <br/>
-- 
cgit v1.2.3-1-g7c22


From 519bebcaeeef46bbe8bbc8ac17e348316fd4903f Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 17 Jun 2015 09:53:15 -0700
Subject: Simplified code changes

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

(limited to 'web/react/components')

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 85be3d45b..65f1da1f8 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -52,7 +52,7 @@ var FindTeamDomain = React.createClass({
                 <div>
                     <span className="signup-team__name">{ config.SiteName }</span>
                     <br/>
-                    <span className="signup-team__subdomain">Enter your {strings.TeamPossessive} domain.</span>
+                    <span className="signup-team__subdomain">Enter your {strings.Team}'s domain.</span>
                     <br/>
                     <br/>
                 </div>
@@ -65,7 +65,7 @@ var FindTeamDomain = React.createClass({
                         <button type="submit" className="btn btn-primary">Continue</button>
                     </div>
                     <div>
-                        <span>Don't remember your {strings.TeamPossessive} domain? <a href="/find_team">Find it here</a></span>
+                        <span>Don't remember your {strings.Team}'s domain? <a href="/find_team">Find it here</a></span>
                     </div>
                     <br/>
                     <br/>
-- 
cgit v1.2.3-1-g7c22