diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-08-07 05:23:16 +0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-08-06 17:23:16 -0700 |
commit | 9eb8d93a0d958b830b1f759dd0917629bd79c8e6 (patch) | |
tree | 2098d0e0ba18bd76aa40527faa4aaa9ca3168301 /webapp/components/admin_console | |
parent | 178ccd16cba26144eac404f413440867b360033c (diff) | |
download | chat-9eb8d93a0d958b830b1f759dd0917629bd79c8e6.tar.gz chat-9eb8d93a0d958b830b1f759dd0917629bd79c8e6.tar.bz2 chat-9eb8d93a0d958b830b1f759dd0917629bd79c8e6.zip |
Updating user access token UI (#7091)
* Updating user access token UI
Updating help text
Updating tokenlistClass
Updating string for token
Updating translations
Updating translations
Updating translations
* Updating translations
* Minor UI fix
* Update manage_tokens_modal.jsx
* Update user_settings_security.jsx
* Update en.json
* Fix merge conflicts
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r-- | webapp/components/admin_console/manage_tokens_modal/manage_tokens_modal.jsx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/webapp/components/admin_console/manage_tokens_modal/manage_tokens_modal.jsx b/webapp/components/admin_console/manage_tokens_modal/manage_tokens_modal.jsx index c31325291..fdef870e5 100644 --- a/webapp/components/admin_console/manage_tokens_modal/manage_tokens_modal.jsx +++ b/webapp/components/admin_console/manage_tokens_modal/manage_tokens_modal.jsx @@ -26,7 +26,7 @@ export default class ManageTokensModal extends React.PureComponent { user: PropTypes.object, /** - * The user access tokens for a user, object with token ids as keys + * The personal access tokens for a user, object with token ids as keys */ userAccessTokens: PropTypes.object, @@ -86,7 +86,7 @@ export default class ManageTokensModal extends React.PureComponent { <div className='manage-row__empty'> <FormattedMessage id='admin.manage_tokens.userAccessTokensNone' - defaultMessage='No user access tokens.' + defaultMessage='No personal access tokens.' /> </div> ); @@ -98,14 +98,14 @@ export default class ManageTokensModal extends React.PureComponent { className='manage-teams__team' > <div className='manage-teams__team-name'> - <div> + <div className='whitespace--nowrap overflow--ellipsis'> <FormattedMessage id='admin.manage_tokens.userAccessTokensNameLabel' - defaultMessage='Name: ' + defaultMessage='Token Description: ' /> {token.description} </div> - <div> + <div className='whitespace--nowrap overflow--ellipsis'> <FormattedMessage id='admin.manage_tokens.userAccessTokensIdLabel' defaultMessage='Token ID: ' @@ -146,7 +146,7 @@ export default class ManageTokensModal extends React.PureComponent { <div className='padding-top x2'> <FormattedHTMLMessage id='admin.manage_tokens.userAccessTokensDescription' - defaultMessage='User access tokens function similar to session tokens and can be used by integrations to <a href="https://about.mattermost.com/default-api-authentication" target="_blank">authenticate against the REST API</a>. Learn more about <a href="https://about.mattermost.com/default-user-access-tokens" target="_blank">user access tokens</a>.' + defaultMessage='Personal access tokens function similar to session tokens and can be used by integrations to <a href="https://about.mattermost.com/default-api-authentication" target="_blank">interact with this Mattermost server</a>. Learn more about <a href="https://about.mattermost.com/default-user-access-tokens" target="_blank">personal access tokens</a>.' /> </div> <div className='manage-teams__teams'> @@ -167,7 +167,7 @@ export default class ManageTokensModal extends React.PureComponent { <Modal.Title> <FormattedMessage id='admin.manage_tokens.manageTokensTitle' - defaultMessage='Manage User Access Tokens' + defaultMessage='Manage Personal Access Tokens' /> </Modal.Title> </Modal.Header> |