diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-07-22 10:12:28 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-07-22 10:12:28 -0400 |
commit | 62c0603c50c7cc85003fb03ed55d1a585c32dc34 (patch) | |
tree | c5f230f7ba2d61da9a50eeafe88a7b5530025f8d /web/react/components/signup_user_oauth.jsx | |
parent | 03528b9619747b8bd184b852497dcf14ee1e0081 (diff) | |
download | chat-62c0603c50c7cc85003fb03ed55d1a585c32dc34.tar.gz chat-62c0603c50c7cc85003fb03ed55d1a585c32dc34.tar.bz2 chat-62c0603c50c7cc85003fb03ed55d1a585c32dc34.zip |
merged with new team domain changes and added signup/login links for gitlab
Diffstat (limited to 'web/react/components/signup_user_oauth.jsx')
-rw-r--r-- | web/react/components/signup_user_oauth.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/signup_user_oauth.jsx b/web/react/components/signup_user_oauth.jsx index 40ed07ef8..6322aedee 100644 --- a/web/react/components/signup_user_oauth.jsx +++ b/web/react/components/signup_user_oauth.jsx @@ -33,7 +33,7 @@ module.exports = React.createClass({ client.createUser(user, "", "", function(data) { client.track('signup', 'signup_user_oauth_02'); - window.location.href = '/login/'+user.auth_service+'?id='+user.team_id; + window.location.href = '/' + this.props.teamName + '/login/'+user.auth_service; }.bind(this), function(err) { this.state.server_error = err.message; @@ -63,14 +63,14 @@ module.exports = React.createClass({ <div> <img className="signup-team-logo" src="/static/images/logo.png" /> <h4>Welcome to { config.SiteName }</h4> - <p>{"To continue signing up with " + this.state.user.auth_type + ", please register a username."}</p> + <p>{"To continue signing up with " + this.state.user.auth_service + ", please register a username."}</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" value={this.state.user.username} onChange={this.handleChange} /> { 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>{ yourEmailIs } You’ll use this address to sign in to {config.SiteName}.</p> <div className="checkbox"><label><input type="checkbox" ref="email_service" /> It's ok to send me occassional email with updates about the {config.SiteName} service. </label></div> <p><button onClick={this.handleSubmit} className="btn-primary btn">Create Account</button></p> |