summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 07:54:30 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 07:54:30 -0700
commit8e65f38979696df993c15a5c3752f4bba91a0978 (patch)
tree7ca8cb11aed7753b04d84fedfe0630879c30a069 /web/react/components
parent9e0d4f70e01ecf8f157fed6e6145284c202bc44a (diff)
parent0d6ed4a6ab14c4fc4bbdf4bd0b63c19d896a7b48 (diff)
downloadchat-8e65f38979696df993c15a5c3752f4bba91a0978.tar.gz
chat-8e65f38979696df993c15a5c3752f4bba91a0978.tar.bz2
chat-8e65f38979696df993c15a5c3752f4bba91a0978.zip
Merge pull request #3 from mattermost/master
to me
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/login.jsx4
-rw-r--r--web/react/components/signup_team_complete.jsx3
-rw-r--r--web/react/components/signup_user_complete.jsx1
3 files changed, 5 insertions, 3 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 8d82a4b62..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="/" 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/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" />