Этот коммит содержится в:
Asaad Mahmood
2015-10-15 22:54:15 +05:00
родитель f09685a373
Коммит 95aaa0a080
22 изменённых файлов: 112 добавлений и 82 удалений

Просмотреть файл

@@ -447,7 +447,7 @@ export default class EmailSettings extends React.Component {
</div>
<div className='help-text'>
<button
className='btn'
className='btn btn-default'
onClick={this.handleTestConnection}
disabled={!this.state.sendEmailNotifications}
id='connection-button'
@@ -482,7 +482,7 @@ export default class EmailSettings extends React.Component {
<p className='help-text'>{'32-character salt added to signing of email invites. Randomly generated on install. Click "Re-Generate" to create new salt.'}</p>
<div className='help-text'>
<button
className='btn'
className='btn btn-default'
onClick={this.handleGenerateInvite}
disabled={!this.state.sendEmailNotifications}
>
@@ -513,7 +513,7 @@ export default class EmailSettings extends React.Component {
<p className='help-text'>{'32-character salt added to signing of password reset emails. Randomly generated on install. Click "Re-Generate" to create new salt.'}</p>
<div className='help-text'>
<button
className='btn'
className='btn btn-default'
onClick={this.handleGenerateReset}
disabled={!this.state.sendEmailNotifications}
>

Просмотреть файл

@@ -116,12 +116,14 @@ export default class GitLabSettings extends React.Component {
<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 className='help-text'>
<ol>
<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>
</div>

Просмотреть файл

@@ -220,7 +220,7 @@ export default class SqlSettings extends React.Component {
<p className='help-text'>{'32-character salt available to encrypt and decrypt sensitive fields in database.'}</p>
<div className='help-text'>
<button
className='help-link'
className='btn btn-default'
onClick={this.handleGenerate}
>
{'Re-Generate'}