summaryrefslogtreecommitdiffstats
path: root/web/react/components/team_signup_url_page.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-25 22:42:38 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-25 22:42:38 -0700
commit70b5918734d996a2b5b3710c2ed519f77f4764d4 (patch)
tree12aac9f88de68cb79404a3985e6bfe774ad8f066 /web/react/components/team_signup_url_page.jsx
parent473221dbada7ad7739d6a969d9d3d5c9c276941b (diff)
parentae2898107d275176126ab07ca1886fd7fd7ddad4 (diff)
downloadchat-70b5918734d996a2b5b3710c2ed519f77f4764d4.tar.gz
chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.tar.bz2
chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.zip
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/react/components/team_signup_url_page.jsx')
-rw-r--r--web/react/components/team_signup_url_page.jsx6
1 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/team_signup_url_page.jsx b/web/react/components/team_signup_url_page.jsx
index 6d333aed6..02d5cab8e 100644
--- a/web/react/components/team_signup_url_page.jsx
+++ b/web/react/components/team_signup_url_page.jsx
@@ -54,7 +54,11 @@ export default class TeamSignupUrlPage extends React.Component {
if (data) {
this.setState({nameError: 'This URL is unavailable. Please try another.'});
} else {
- this.props.state.wizard = 'send_invites';
+ if (global.window.mm_config.SendEmailNotifications === 'true') {
+ this.props.state.wizard = 'send_invites';
+ } else {
+ this.props.state.wizard = 'username';
+ }
this.props.state.team.type = 'O';
this.props.state.team.name = name;