diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-29 00:02:01 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-29 00:02:01 +0500 |
commit | 2935e7c1bf7aa02efd395e5877f7073461916677 (patch) | |
tree | 38e108cc0386871d8223d3fae2c8b2507ffb5459 /web/react/components/user_settings/user_settings.jsx | |
parent | e104829dcd7ae8ea0d6ab87f341cf5c5f1b30a41 (diff) | |
parent | ccf9e0cabd9fcede118ca54b24adb33c788a7ae9 (diff) | |
download | chat-2935e7c1bf7aa02efd395e5877f7073461916677.tar.gz chat-2935e7c1bf7aa02efd395e5877f7073461916677.tar.bz2 chat-2935e7c1bf7aa02efd395e5877f7073461916677.zip |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/components/user_settings/user_settings.jsx')
-rw-r--r-- | web/react/components/user_settings/user_settings.jsx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/web/react/components/user_settings/user_settings.jsx b/web/react/components/user_settings/user_settings.jsx index 15bf961d6..546e26ca3 100644 --- a/web/react/components/user_settings/user_settings.jsx +++ b/web/react/components/user_settings/user_settings.jsx @@ -10,6 +10,7 @@ var AppearanceTab = require('./user_settings_appearance.jsx'); var DeveloperTab = require('./user_settings_developer.jsx'); var IntegrationsTab = require('./user_settings_integrations.jsx'); var DisplayTab = require('./user_settings_display.jsx'); +var AdvancedTab = require('./user_settings_advanced.jsx'); export default class UserSettings extends React.Component { constructor(props) { @@ -110,6 +111,17 @@ export default class UserSettings extends React.Component { /> </div> ); + } else if (this.props.activeTab === 'advanced') { + return ( + <div> + <AdvancedTab + user={this.state.user} + activeSection={this.props.activeSection} + updateSection={this.props.updateSection} + updateTab={this.props.updateTab} + /> + </div> + ); } return <div/>; |