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/components/admin_console/admin_sidebar.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/components/admin_console/admin_sidebar.jsx')
| -rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index c947be5cb..28769d484 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -533,6 +533,16 @@ export default class AdminSidebar extends React.Component { > {customBranding} <AdminSidebarSection + name='custom_emoji' + title={ + <FormattedMessage + id='admin.sidebar.customEmoji' + defaultMessage='Custom Emoji' + /> + + } + /> + <AdminSidebarSection name='legal_and_support' title={ <FormattedMessage |