summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-06-16 10:15:18 -0800
committer=Corey Hulen <corey@hulen.com>2015-06-16 10:15:18 -0800
commit36972a68ec077cf1bc7e752814e71f95baab4cb7 (patch)
tree8a08e5b483c80a7782fb0de30dac510bfafc5424 /web/react
parente521bfc07647f6d4b134c9dbb12f5c0a4545fc55 (diff)
parentf9bd51ed5a6303a076a7120f6e5a351ac400c6ba (diff)
downloadchat-36972a68ec077cf1bc7e752814e71f95baab4cb7.tar.gz
chat-36972a68ec077cf1bc7e752814e71f95baab4cb7.tar.bz2
chat-36972a68ec077cf1bc7e752814e71f95baab4cb7.zip
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/signup_team_complete.jsx3
-rw-r--r--web/react/components/signup_user_complete.jsx1
2 files changed, 3 insertions, 1 deletions
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" />