diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-06-14 09:38:19 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-06-14 07:38:19 -0600 |
| commit | a0cc913b85dea5023b705697afa5cd8749a6e5de (patch) | |
| tree | debe3365ea1e66e94bd0a4738bf4faa0f10eac05 /config | |
| parent | 661f221727109f2298812fea89347bfeaf984109 (diff) | |
| download | chat-a0cc913b85dea5023b705697afa5cd8749a6e5de.tar.gz chat-a0cc913b85dea5023b705697afa5cd8749a6e5de.tar.bz2 chat-a0cc913b85dea5023b705697afa5cd8749a6e5de.zip | |
PLT-3143 Added serverside code for custom Emoji (#3311)
* Added model objects for emoji
* Added database tables for emoji
* Added settings for custom emoji
* Added serverside APIs and unit tests for custom emoji
* Added additional validation to catch duplicate emoji names earlier on
* Added additional validation to prevent users from adding emoji as another user
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json index db62b0bac..13936ee9e 100644 --- a/config/config.json +++ b/config/config.json @@ -23,7 +23,9 @@ "SessionCacheInMinutes": 10, "WebsocketSecurePort": 443, "WebsocketPort": 80, - "WebserverMode": "regular" + "WebserverMode": "regular", + "EnableCustomEmoji": true, + "RestrictCustomEmojiCreation": "all" }, "TeamSettings": { "SiteName": "Mattermost", |