diff options
author | Corey Hulen <corey@hulen.com> | 2015-06-15 10:01:57 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-06-15 10:01:57 -0800 |
commit | 334261ece1bd312678f8eb65b2fde3f636a0475d (patch) | |
tree | 9cda9424ef22ddb9a431f9f6472eb7684948f266 /web/react/components/user_settings.jsx | |
parent | 61eac918b74494b085ff1863a027aa79437ed1ac (diff) | |
parent | 54ab3c896de244e56c52df2c877ff63814a53d33 (diff) | |
download | chat-334261ece1bd312678f8eb65b2fde3f636a0475d.tar.gz chat-334261ece1bd312678f8eb65b2fde3f636a0475d.tar.bz2 chat-334261ece1bd312678f8eb65b2fde3f636a0475d.zip |
Merge pull request #3 from mattermost/mm-1237
fixes mm-1237 remove sessions and activity log from account settings
Diffstat (limited to 'web/react/components/user_settings.jsx')
-rw-r--r-- | web/react/components/user_settings.jsx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index b165a59ad..a9c2433f2 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -1126,6 +1126,9 @@ module.exports = React.createClass({ <NotificationsTab user={this.state.user} activeSection={this.props.activeSection} updateSection={this.props.updateSection} /> </div> ); + + /* Temporarily removing sessions and activity_log tabs + } else if (this.props.activeTab === 'sessions') { return ( <div> @@ -1138,6 +1141,8 @@ module.exports = React.createClass({ <AuditTab activeSection={this.props.activeSection} updateSection={this.props.updateSection} /> </div> ); + */ + } else if (this.props.activeTab === 'appearance') { return ( <div> |