Merge pull request #1392 from turt2live/travis/no_emoji

Add option to disable Emoji suggestions
2017-09-17 21:40:43 +01:00 · 2017-09-17 21:40:43 +01:00 · bc565ba925
commit bc565ba925
parent 9449813238 b2de016b35
4 changed files with 11 additions and 0 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -105,6 +105,10 @@ const SETTINGS_LABELS = [
        id: 'MessageComposerInput.autoReplaceEmoji',
        label: 'Automatically replace plain text Emoji',
    },
+    {
+        id: 'MessageComposerInput.dontSuggestEmoji',
+        label: 'Disable Emoji suggestions while typing',
+    },
    {
        id: 'Pill.shouldHidePillAvatar',
        label: 'Hide avatars in user and room mentions',