Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-14713 - Updating help text security panel #2658

Merged
merged 1 commit into from
Apr 15, 2019
Merged

MM-14713 - Updating help text security panel #2658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions components/user_settings/security/user_settings_security.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint col-sm-12'>
<div className='padding-bottom x2'>
<FormattedMessage
id='user.settings.security.passwordGitlabCantUpdate'
defaultMessage='Login occurs through GitLab. Password cannot be updated.'
Expand All @@ -310,7 +310,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint col-sm-12'>
<div className='padding-bottom x2'>
<FormattedMessage
id='user.settings.security.passwordLdapCantUpdate'
defaultMessage='Login occurs through AD/LDAP. Password cannot be updated.'
Expand All @@ -324,7 +324,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint col-sm-12'>
<div className='padding-bottom x2'>
<FormattedMessage
id='user.settings.security.passwordSamlCantUpdate'
defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so through your login provider.'
Expand All @@ -338,7 +338,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint col-sm-12'>
<div className='padding-bottom x2'>
<FormattedMessage
id='user.settings.security.passwordGoogleCantUpdate'
defaultMessage='Login occurs through Google Apps. Password cannot be updated.'
Expand All @@ -352,7 +352,7 @@ export default class SecurityTab extends React.Component {
key='oauthEmailInfo'
className='form-group'
>
<div className='setting-list__hint col-sm-12'>
<div className='padding-bottom x2'>
<FormattedMessage
id='user.settings.security.passwordOffice365CantUpdate'
defaultMessage='Login occurs through Office 365. Password cannot be updated.'
Expand Down