From 081b22f7bb29ce4f884177c7782c838a5939e9a4 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')

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 5695a6a4b7969837ab72e68b36fad7adfc644f4d 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')

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 14b409220e76e73fab6b0df9c724599bc97b1da2 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 ++--
 web/react/utils/utils.jsx      | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'web/react')

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>
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 72ed48faf..b20e54e84 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -730,3 +730,15 @@ Image.prototype.load = function(url, progressCallback) {
 };
 
 Image.prototype.completedPercentage = 0;
+
+module.exports.getHomeLink = function() {
+	if (config.HomeLink != "") {
+		return config.HomeLink;
+	}
+	var parts = window.location.host.split(".");
+	if (parts.length <= 1) {
+		return window.location.host;
+	}
+	parts[0] = "www";
+	return parts.join(".");
+}
-- 
cgit v1.2.3-1-g7c22


From 8d3b36ed3d68613b2155d6e7d448a1ed69611e62 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 16 Jun 2015 16:42:14 -0400
Subject: Fixing link

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

(limited to 'web/react')

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index b20e54e84..628d92342 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -737,8 +737,8 @@ module.exports.getHomeLink = function() {
 	}
 	var parts = window.location.host.split(".");
 	if (parts.length <= 1) {
-		return window.location.host;
+		return window.location.protocol + "//" + window.location.host;
 	}
 	parts[0] = "www";
-	return parts.join(".");
+	return window.location.protocol + "//" + parts.join(".");
 }
-- 
cgit v1.2.3-1-g7c22