From 224575e099b2116f9f7c2a5eef44f6433464c953 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Wed, 3 Aug 2016 19:30:11 -0400 Subject: Update help text for Google/Office 365 OAuth (#3725) * Update help text for Google/Office 365 OAuth * Update en.json * Change " to ' in .jsx * Fix errors caused by " --- webapp/i18n/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webapp/i18n') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index a512a9e74..00fbe6ab6 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 - as the project name.
  3. Click the OAuth consent screen header and enter Mattermost as the Product name to show users. 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 /signup/google/complete (example: http://localhost:8065/signup/google/complete). Click Create.
  6. Save the client ID and client secret to later complete the fields below.
  7. Finally, go to Google+ API and click Enable. This might take a few minutes to propagate through Google's systems.
  8. Complete the Client ID and Client Secret fields below.
", + "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\"", @@ -311,7 +311,7 @@ "admin.google.clientSecretTitle": "Client Secret:", "admin.google.tokenTitle": "Token Endpoint:", "admin.google.userTitle": "User API Endpoint:", - "admin.office365.EnableHtmlDesc": "
  1. Log in to your Microsoft or Office 365 account. Make sure it's the account on the same tenant that you would like users to log in with.
  2. Go to https://apps.dev.microsoft.com, click Add an app and use Mattermost - as the application name.
  3. Under Application Secrets, click Generate New Password and save it to later complete the field below.
  4. Under Platforms, click Add Platform, choose Web and enter /signup/office365/complete (example: http://localhost:8065/signup/office365/complete) under Redirect URIs. Also uncheck Allow Implicit Flow.
  5. Finally, click Save and complete the Application ID and Application Secret Password fields below.
", + "admin.office365.EnableHtmlDesc": "
  1. Log in to your Microsoft or Office 365 account. Make sure it's the account on the same tenant that you would like users to log in with.
  2. Go to https://apps.dev.microsoft.com, click Go to app list > Add an app and use \"Mattermost - your-company-name\" as the Application Name.
  3. Under Application Secrets, click Generate New Password and paste it to the Application Secret Password field below.
  4. Under Platforms, click Add Platform, choose Web and enter your-mattermost-url/signup/office365/complete (example: http://localhost:8065/signup/office365/complete) under Redirect URIs. Also uncheck Allow Implicit Flow.
  5. Finally, click Save and then paste the Application ID below.
", "admin.office365.authTitle": "Auth Endpoint:", "admin.office365.clientIdDescription": "The Application/Client ID you received when registering your application with Microsoft.", "admin.office365.clientIdExample": "Ex \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"", -- cgit v1.2.3-1-g7c22