diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-08-16 14:41:47 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-08-16 14:41:47 -0400 |
commit | 8203fd16ce3356d69b0cc51287d0a1fc25318b2d (patch) | |
tree | a25893649505d0a75fc1d0aac16790b3e07981c4 /webapp/components/admin_console/connection_security_dropdown_setting.jsx | |
parent | dde158c57f24e6da6ad5d05eebc104fccec855e8 (diff) | |
download | chat-8203fd16ce3356d69b0cc51287d0a1fc25318b2d.tar.gz chat-8203fd16ce3356d69b0cc51287d0a1fc25318b2d.tar.bz2 chat-8203fd16ce3356d69b0cc51287d0a1fc25318b2d.zip |
PLT-3647 Email Batching (#3718)
* PLT-3647 Added config settings for email batching
* PLT-3647 Refactored generation of email notification
* PLT-3647 Added serverside code for email batching
* PLT-3647 Updated settings UI to enable email batching
* PLT-3647 Removed debug code
* PLT-3647 Fixed 0-padding of minutes in batched notification
* PLT-3647 Updated clientside UI for when email batching is disabled
* Go fmt
* PLT-3647 Changed email batching to be disabled by default
* Updated batched email message
* Added email batching toggle to system console
* Changed Email Notifications > Immediate setting to a 30 second batch interval
* Go fmt
* Fixed link to Mattermost icon in batched email notification
* Updated users to use 30 second email batching by default
* Fully disabled email batching when clustering is enabled
* Fixed email batching setting in the system console
* Fixed casing of 'Send Email notifications' -> 'Send email notifications'
* Updating UI Improvements for email batching (#3736)
* Updated text for notification settings and SiteURL.
* Prevented enabling email batching when SiteURL isn't set in the system console
* Re-added a couple debug messages
* Added warning text when clustering is enabled
Diffstat (limited to 'webapp/components/admin_console/connection_security_dropdown_setting.jsx')
-rw-r--r-- | webapp/components/admin_console/connection_security_dropdown_setting.jsx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webapp/components/admin_console/connection_security_dropdown_setting.jsx b/webapp/components/admin_console/connection_security_dropdown_setting.jsx index b3e9ac31c..09768049e 100644 --- a/webapp/components/admin_console/connection_security_dropdown_setting.jsx +++ b/webapp/components/admin_console/connection_security_dropdown_setting.jsx @@ -14,13 +14,13 @@ const CONNECTION_SECURITY_HELP_TEXT = ( > <tbody> <tr> - <td className='help-text'> + <td> <FormattedMessage id='admin.connectionSecurityNone' defaultMessage='None' /> </td> - <td className='help-text'> + <td> <FormattedMessage id='admin.connectionSecurityNoneDescription' defaultMessage='Mattermost will connect over an unsecure connection.' @@ -28,13 +28,13 @@ const CONNECTION_SECURITY_HELP_TEXT = ( </td> </tr> <tr> - <td className='help-text'> + <td> <FormattedMessage id='admin.connectionSecurityTls' defaultMessage='TLS' /> </td> - <td className='help-text'> + <td> <FormattedMessage id='admin.connectionSecurityTlsDescription' defaultMessage='Encrypts the communication between Mattermost and your server.' @@ -42,13 +42,13 @@ const CONNECTION_SECURITY_HELP_TEXT = ( </td> </tr> <tr> - <td className='help-text'> + <td> <FormattedMessage id='admin.connectionSecurityStart' defaultMessage='STARTTLS' /> </td> - <td className='help-text'> + <td> <FormattedMessage id='admin.connectionSecurityStartDescription' defaultMessage='Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.' |