diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 20:55:56 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 20:55:56 +0500 |
commit | 1c186121fe04fb61d945f0b57112e28675c8e066 (patch) | |
tree | f2cf511b15990bd01bfde349016388af39f8d340 /web/react/pages | |
parent | 5d77ff4bcde3496554551701438c1f42550e58b3 (diff) | |
parent | 27dbcd8767426a60699d2acbeeb9b8a825d5b728 (diff) | |
download | chat-1c186121fe04fb61d945f0b57112e28675c8e066.tar.gz chat-1c186121fe04fb61d945f0b57112e28675c8e066.tar.bz2 chat-1c186121fe04fb61d945f0b57112e28675c8e066.zip |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'web/react/pages')
-rw-r--r-- | web/react/pages/signup_team_complete.jsx | 4 | ||||
-rw-r--r-- | web/react/pages/signup_user_complete.jsx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/web/react/pages/signup_team_complete.jsx b/web/react/pages/signup_team_complete.jsx index 346f2ab5a..71806c2ea 100644 --- a/web/react/pages/signup_team_complete.jsx +++ b/web/react/pages/signup_team_complete.jsx @@ -3,9 +3,9 @@ var SignupTeamComplete =require('../components/signup_team_complete.jsx'); -global.window.setup_signup_team_complete_page = function(email, name, data, hash) { +global.window.setup_signup_team_complete_page = function(email, data, hash) { React.render( - <SignupTeamComplete name={name} email={email} hash={hash} data={data}/>, + <SignupTeamComplete email={email} hash={hash} data={data}/>, document.getElementById('signup-team-complete') ); }; diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx index 60c3a609a..8f9be1f94 100644 --- a/web/react/pages/signup_user_complete.jsx +++ b/web/react/pages/signup_user_complete.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. -var SignupUserComplete =require('../components/signup_user_complete.jsx'); +var SignupUserComplete = require('../components/signup_user_complete.jsx'); global.window.setup_signup_user_complete_page = function(email, name, ui_name, id, data, hash, auth_services) { React.render( |