diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-06-06 10:26:43 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-06 10:26:43 -0400 |
| commit | 9110e64c258edd95db3df554e0bd255cbe2ef88a (patch) | |
| tree | 0d8a873bb044ce361c656e3602333e29227ec12a /webapp | |
| parent | 5748295d3b544883cbd47d8fa2c7d617faa57cac (diff) | |
| download | chat-9110e64c258edd95db3df554e0bd255cbe2ef88a.tar.gz chat-9110e64c258edd95db3df554e0bd255cbe2ef88a.tar.bz2 chat-9110e64c258edd95db3df554e0bd255cbe2ef88a.zip | |
Removing outdated ldap note from system console (#3247)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/ldap_settings.jsx | 9 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx index fb121f656..acda672d8 100644 --- a/webapp/components/admin_console/ldap_settings.jsx +++ b/webapp/components/admin_console/ldap_settings.jsx @@ -2,7 +2,6 @@ // See License.txt for license information. import AdminSettings from './admin_settings.jsx'; -import Banner from './banner.jsx'; import BooleanSetting from './boolean_setting.jsx'; import ConnectionSecurityDropdownSetting from './connection_security_dropdown_setting.jsx'; import SettingsGroup from './settings_group.jsx'; @@ -85,14 +84,6 @@ export default class LdapSettings extends AdminSettings { return ( <SettingsGroup> - <Banner - description={ - <FormattedMessage - id='admin.ldap.bannerDesc' - defaultMessage='If a user attribute changes on the LDAP server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from an LDAP server. Synchronization with LDAP servers is planned in a future release.' - /> - } - /> <BooleanSetting id='enable' label={ diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 6272664c5..5822fc06c 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -243,7 +243,6 @@ "admin.image.thumbWidthDescription": "Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.", "admin.image.thumbWidthExample": "Ex \"120\"", "admin.image.thumbWidthTitle": "Thumbnail Width:", - "admin.ldap.bannerDesc": "If a user attribute changes on the LDAP server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from an LDAP server. Synchronization with LDAP servers is planned in a future release.", "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the LDAP tree.", "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"", "admin.ldap.baseTitle": "BaseDN:", |