From ac90f5b38962c301318fff9118c4556537002941 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Thu, 4 Aug 2016 13:20:01 -0400 Subject: Update text for OAuth 2.0 and Google SSO (#3740) * Update help text for OAuth * Update oauth_settings.jsx * Update en.json --- webapp/components/admin_console/custom_integrations_settings.jsx | 2 +- webapp/components/admin_console/oauth_settings.jsx | 2 +- webapp/i18n/en.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'webapp') diff --git a/webapp/components/admin_console/custom_integrations_settings.jsx b/webapp/components/admin_console/custom_integrations_settings.jsx index cfa1a30ae..1371e5aac 100644 --- a/webapp/components/admin_console/custom_integrations_settings.jsx +++ b/webapp/components/admin_console/custom_integrations_settings.jsx @@ -117,7 +117,7 @@ export default class WebhookSettings extends AdminSettings { helpText={ } value={this.state.enableOAuthServiceProvider} diff --git a/webapp/components/admin_console/oauth_settings.jsx b/webapp/components/admin_console/oauth_settings.jsx index 61a0dd156..ad7d2159f 100644 --- a/webapp/components/admin_console/oauth_settings.jsx +++ b/webapp/components/admin_console/oauth_settings.jsx @@ -385,7 +385,7 @@ export default class OAuthSettings extends AdminSettings { helpText = ( ); } else if (this.state.oauthType === Constants.OFFICE365_SERVICE) { diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 457201cc7..8a34a8b1d 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -301,7 +301,7 @@ "admin.gitlab.userDescription": "Enter https:///api/v3/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.", "admin.gitlab.userExample": "Ex \"https:///api/v3/user\"", "admin.gitlab.userTitle": "User API Endpoint:", - "admin.google.EnableHtmlDesc": "
  1. Log in to your Google account.
  2. Go to https://console.developers.google.com, click Credentials in the left hand sidebar and enter \"Mattermost - your-company-name\" as the Project Name, then click Create.
  3. Click the OAuth consent screen header and enter \"Mattermost\" as the Product name shown to users, then click Save.
  4. Under the Credentials header, click Create credentials, choose OAuth client ID and select Web Application.
  5. Under Restrictions and Authorized redirect URIs enter your-mattermost-url/signup/google/complete (example: http://localhost:8065/signup/google/complete). Click Create.
  6. Paste the Client ID and Client Secret to the fields below, then click Save.
  7. Finally, go to Google+ API and click Enable. This might take a few minutes to propagate through Google's systems.
", + "admin.google.EnableHtmlDesc": "
  1. Log in to your Google account.
  2. Go to https://console.developers.google.com, click Credentials in the left hand sidebar and enter \"Mattermost - your-company-name\" as the Project Name, then click Create.
  3. Click the OAuth consent screen header and enter \"Mattermost\" as the Product name shown to users, then click Save.
  4. Under the Credentials header, click Create credentials, choose OAuth client ID and select Web Application.
  5. Under Restrictions and Authorized redirect URIs enter your-mattermost-url/signup/google/complete (example: http://localhost:8065/signup/google/complete). Click Create.
  6. Paste the Client ID and Client Secret to the fields below, then click Save.
  7. Finally, go to Google+ API and click Enable. This might take a few minutes to propagate through Google's systems.
", "admin.google.authTitle": "Auth Endpoint:", "admin.google.clientIdDescription": "The Client ID you received when registering your application with Google.", "admin.google.clientIdExample": "Ex \"7602141235235-url0fhs1mayfasbmop5qlfns8dh4.apps.googleusercontent.com\"", @@ -470,7 +470,7 @@ "admin.office365.clientSecretTitle": "Application Secret Password:", "admin.office365.tokenTitle": "Token Endpoint:", "admin.office365.userTitle": "User API Endpoint:", - "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing external applications to authorize API requests to Mattermost.", + "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.", "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ", "admin.password.lowercase": "At least one lowercase letter", "admin.password.minimumLength": "Minimum Password Length:", -- cgit v1.2.3-1-g7c22