diff options
| author | JoramWilander <jwawilander@gmail.com> | 2016-06-13 15:29:24 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2016-06-13 15:29:24 -0400 |
| commit | 5af526c259d9c6477d67eb8f8a1e7b86270c7294 (patch) | |
| tree | 97cc595107026a1f19d6fd6e35627dda23979aa3 /webapp/components/admin_console/ldap_settings.jsx | |
| parent | bb5ca5a8780f9259306d881e85760de8b87ddea8 (diff) | |
| parent | 974238231b9cdbd39a825ec8e9299fbb0b51f6b8 (diff) | |
| download | chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.tar.gz chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.tar.bz2 chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.zip | |
Merge branch 'release-3.1'
Conflicts:
webapp/components/create_comment.jsx
Diffstat (limited to 'webapp/components/admin_console/ldap_settings.jsx')
| -rw-r--r-- | webapp/components/admin_console/ldap_settings.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx index acda672d8..01d4b0a67 100644 --- a/webapp/components/admin_console/ldap_settings.jsx +++ b/webapp/components/admin_console/ldap_settings.jsx @@ -343,7 +343,7 @@ export default class LdapSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.ldap.syncIntervalHelpText' - defaultMessage='LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour.' + defaultMessage='LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour. Changing this will require a server restart before taking effect.' /> } value={this.state.syncIntervalMinutes} |