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 /webapp/root.jsx | |
| 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 'webapp/root.jsx')
| -rw-r--r-- | webapp/root.jsx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx index a96ab713b..b6302a76f 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -73,6 +73,7 @@ import DatabaseSettings from 'components/admin_console/database_settings.jsx'; import StorageSettings from 'components/admin_console/storage_settings.jsx'; import ImageSettings from 'components/admin_console/image_settings.jsx'; import CustomBrandSettings from 'components/admin_console/custom_brand_settings.jsx'; +import CustomEmojiSettings from 'components/admin_console/custom_emoji_settings.jsx'; import LegalAndSupportSettings from 'components/admin_console/legal_and_support_settings.jsx'; import ComplianceSettings from 'components/admin_console/compliance_settings.jsx'; import RateSettings from 'components/admin_console/rate_settings.jsx'; @@ -462,6 +463,10 @@ function renderRootComponent() { component={CustomBrandSettings} /> <Route + path='custom_emoji' + component={CustomEmojiSettings} + /> + <Route path='legal_and_support' component={LegalAndSupportSettings} /> |