diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-10-13 22:52:28 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-13 22:52:28 -0400 |
| commit | a4adc9b95ee821d91b54235b0883a300e10da114 (patch) | |
| tree | 0b4a3696eb238f697143872460dd030a594487cc /web/react/components | |
| parent | 56b02f2ebab6646b1d978b8f873d4949670967e2 (diff) | |
| parent | 4cfe8ce6998d620feb710a8847cd59863f29896c (diff) | |
| download | chat-a4adc9b95ee821d91b54235b0883a300e10da114.tar.gz chat-a4adc9b95ee821d91b54235b0883a300e10da114.tar.bz2 chat-a4adc9b95ee821d91b54235b0883a300e10da114.zip | |
Merge pull request #1038 from asaadmahmoodspin/ui-improvements
Multiple Ui Improvements
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/admin_console/gitlab_settings.jsx | 10 | ||||
| -rw-r--r-- | web/react/components/post_info.jsx | 1 | ||||
| -rw-r--r-- | web/react/components/user_settings/user_settings_appearance.jsx | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx index 6aeb92f93..5c22bf5cf 100644 --- a/web/react/components/admin_console/gitlab_settings.jsx +++ b/web/react/components/admin_console/gitlab_settings.jsx @@ -113,7 +113,15 @@ export default class GitLabSettings extends React.Component { /> {'false'} </label> - <p className='help-text'>{'When true, Mattermost allows team creation and account signup using GitLab OAuth. To configure, log in to your GitLab account and go to Applications -> Profile Settings. Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". Then use "Secret" and "Id" fields to complete the options below.'}</p> + <p className='help-text'> + {'When true, Mattermost allows team creation and account signup using GitLab OAuth.'} <br/> + </p> + <ol className='help-text'> + <li>{'Log in to your GitLab account and go to Applications -> Profile Settings.'}</li> + <li>{'Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". '}</li> + <li>{'Then use "Secret" and "Id" fields from GitLab to complete the options below.'}</li> + <li>{'Complete the Endpoint URLs below. '}</li> + </ol> </div> </div> diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index 87962641f..7addd825f 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -150,6 +150,7 @@ export default class PostInfo extends React.Component { <ul className='post-header post-info'> <li className='post-header-col'> <OverlayTrigger + container={this} placement='top' overlay={tooltip} > diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx index 6d64e83b6..a16440d55 100644 --- a/web/react/components/user_settings/user_settings_appearance.jsx +++ b/web/react/components/user_settings/user_settings_appearance.jsx @@ -178,7 +178,7 @@ export default class UserSettingsAppearance extends React.Component { href='#' onClick={this.submitTheme} > - {'Submit'} + {'Save'} </a> <a className='btn btn-sm theme' |