diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 11:22:53 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-15 11:22:53 -0700 |
commit | 0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7 (patch) | |
tree | 3f86c6872aa94ee0530f8a6d2b7458fa655c11de /web/react/components/user_settings.jsx | |
parent | b7a821c3410ecd165241e2dbcf2c8376ae402124 (diff) | |
parent | 6f10c401a422170d42d9cee8ec01b94808fa338f (diff) | |
download | chat-0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7.tar.gz chat-0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7.tar.bz2 chat-0cd93cf2da14a4e058eef06a0a0c1770e2fe3ab7.zip |
Merge pull request #1 from mattermost/master
to me
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> |