summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings/user_settings.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-04-05 09:29:01 -0400
committerChristopher Speller <crspeller@gmail.com>2016-04-05 09:29:01 -0400
commitb3edd32aee47a0b123870de58664600acc17087b (patch)
tree41840177672480ff428f279437a5a08a6eccaeb6 /webapp/components/user_settings/user_settings.jsx
parentc12d997f248c143b7746d07a3c2ce9b58a3ecd5e (diff)
downloadchat-b3edd32aee47a0b123870de58664600acc17087b.tar.gz
chat-b3edd32aee47a0b123870de58664600acc17087b.tar.bz2
chat-b3edd32aee47a0b123870de58664600acc17087b.zip
PLT-1750 Moved slash commands to backstage
* Added slash commands to InstalledIntegrations page * Reset installed integration type filter if there is no longer any integrations of the selected type * Added pages to backstage to add slash commands * Cleaned up internationalization for slash commands * Added ability to regen slash command tokens from backstage * Removed Integrations tab from UserSettings
Diffstat (limited to 'webapp/components/user_settings/user_settings.jsx')
-rw-r--r--webapp/components/user_settings/user_settings.jsx15
1 files changed, 0 insertions, 15 deletions
diff --git a/webapp/components/user_settings/user_settings.jsx b/webapp/components/user_settings/user_settings.jsx
index 904232da9..d89298cfb 100644
--- a/webapp/components/user_settings/user_settings.jsx
+++ b/webapp/components/user_settings/user_settings.jsx
@@ -7,7 +7,6 @@ import NotificationsTab from './user_settings_notifications.jsx';
import SecurityTab from './user_settings_security.jsx';
import GeneralTab from './user_settings_general.jsx';
import DeveloperTab from './user_settings_developer.jsx';
-import IntegrationsTab from './user_settings_integrations.jsx';
import DisplayTab from './user_settings_display.jsx';
import AdvancedTab from './user_settings_advanced.jsx';
@@ -98,20 +97,6 @@ export default class UserSettings extends React.Component {
/>
</div>
);
- } else if (this.props.activeTab === 'integrations') {
- return (
- <div>
- <IntegrationsTab
- ref='activeTab'
- user={this.state.user}
- activeSection={this.props.activeSection}
- updateSection={this.props.updateSection}
- updateTab={this.props.updateTab}
- closeModal={this.props.closeModal}
- collapseModal={this.props.collapseModal}
- />
- </div>
- );
} else if (this.props.activeTab === 'display') {
return (
<div>