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 /utils/config.go | |
| 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 'utils/config.go')
| -rw-r--r-- | utils/config.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 9700f44e0..f3b62a25a 100644 --- a/utils/config.go +++ b/utils/config.go @@ -251,6 +251,9 @@ func getClientConfig(c *model.Config) map[string]string { props["AvailableLocales"] = *c.LocalizationSettings.AvailableLocales props["SQLDriverName"] = c.SqlSettings.DriverName + props["EnableCustomEmoji"] = strconv.FormatBool(*c.ServiceSettings.EnableCustomEmoji) + props["RestrictCustomEmojiCreation"] = *c.ServiceSettings.RestrictCustomEmojiCreation + if IsLicensed { if *License.Features.CustomBrand { props["EnableCustomBrand"] = strconv.FormatBool(*c.TeamSettings.EnableCustomBrand) |