From 6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Fri, 16 Oct 2015 09:10:54 -0700 Subject: Inital support for multi-tab loging --- web/react/components/about_build_modal.jsx | 2 +- web/react/components/channel_loader.jsx | 1 - web/react/components/email_verify.jsx | 4 +- web/react/components/invite_member_modal.jsx | 2 +- web/react/components/login.jsx | 15 +- web/react/components/navbar_dropdown.jsx | 2 +- web/react/components/password_reset_form.jsx | 2 +- web/react/components/post.jsx | 2 +- web/react/components/post_body.jsx | 4 +- web/react/components/post_header.jsx | 2 +- web/react/components/rhs_root_post.jsx | 4 +- web/react/components/setting_picture.jsx | 2 +- web/react/components/sidebar.jsx | 4 +- web/react/components/sidebar_header.jsx | 2 +- web/react/components/sidebar_right_menu.jsx | 4 +- web/react/components/signup_team.jsx | 8 +- web/react/components/signup_user_complete.jsx | 25 ++-- web/react/components/team_signup_choose_auth.jsx | 4 +- web/react/components/team_signup_password_page.jsx | 19 ++- .../components/team_signup_send_invites_page.jsx | 2 +- web/react/components/team_signup_welcome_page.jsx | 2 +- web/react/components/user_profile.jsx | 2 +- .../user_settings/user_settings_general.jsx | 6 +- .../user_settings/user_settings_modal.jsx | 4 +- .../user_settings/user_settings_notifications.jsx | 2 +- web/react/components/view_image_popover_bar.jsx | 2 +- web/react/pages/channel.jsx | 10 +- web/react/stores/browser_store.jsx | 82 ++++++++--- web/react/stores/error_store.jsx | 2 + web/react/stores/post_store.jsx | 20 +-- web/react/stores/team_store.jsx | 64 ++++----- web/react/stores/user_store.jsx | 156 +++++++++++---------- web/react/utils/async_client.jsx | 19 +-- web/react/utils/client.jsx | 6 +- web/react/utils/constants.jsx | 1 - 35 files changed, 259 insertions(+), 229 deletions(-) (limited to 'web/react') diff --git a/web/react/components/about_build_modal.jsx b/web/react/components/about_build_modal.jsx index e8a46086a..6962876d4 100644 --- a/web/react/components/about_build_modal.jsx +++ b/web/react/components/about_build_modal.jsx @@ -14,7 +14,7 @@ export default class AboutBuildModal extends React.Component { } render() { - const config = global.window.config; + const config = global.window.mm_config; return ( Your email has been verified! Click here to log in.
Please verify your email address. Check your inbox for an email.
{'Enter a new password for your ' + this.props.teamDisplayName + ' ' + global.window.config.SiteName + ' account.'}
{'Enter a new password for your ' + this.props.teamDisplayName + ' ' + global.window.mm_config.SiteName + ' account.'}
By proceeding to create your account and use {global.window.config.SiteName}, you agree to our Terms of Service and Privacy Policy. If you do not agree, you cannot use {global.window.config.SiteName}.
By proceeding to create your account and use {global.window.mm_config.SiteName}, you agree to our Terms of Service and Privacy Policy. If you do not agree, you cannot use {global.window.mm_config.SiteName}.
Let's set up your new team
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx index 715161b4f..e731fb92c 100644 --- a/web/react/components/user_profile.jsx +++ b/web/react/components/user_profile.jsx @@ -71,7 +71,7 @@ export default class UserProfile extends React.Component { width='128' /> ); - if (!global.window.config.ShowEmailAddress === 'true') { + if (!global.window.mm_config.ShowEmailAddress === 'true') { dataContent.push(