summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-07-06 08:48:34 +0800
committerGitHub <noreply@github.com>2017-07-06 08:48:34 +0800
commit279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c (patch)
treee94482d436da3bc8eb0d4021edbf5631cb75322d /webapp/components/user_settings
parent918ce03622c3fb618a13c240e7c4d51edf5a818b (diff)
downloadchat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.tar.gz
chat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.tar.bz2
chat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.zip
[PLT-6969] System console setting for the emoji picker (#6809)
* system console setting for the emoji picker * remove state.emojiPickerEnable * update url to /admin_console/customization/emoji
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_advanced.jsx7
1 files changed, 0 insertions, 7 deletions
diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx
index cc5824589..0565310d5 100644
--- a/webapp/components/user_settings/user_settings_advanced.jsx
+++ b/webapp/components/user_settings/user_settings_advanced.jsx
@@ -350,13 +350,6 @@ export default class AdvancedSettingsDisplay extends React.Component {
defaultMessage='Enable the ability to make and receive one-on-one WebRTC calls'
/>
);
- case 'EMOJI_PICKER_PREVIEW':
- return (
- <FormattedMessage
- id='user.settings.advance.emojipicker'
- defaultMessage='Enable emoji picker for reactions and message input box'
- />
- );
default:
return null;
}