diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-08-10 15:20:18 -0400 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-08-10 14:20:18 -0500 |
| commit | 3ef26de2ac9789407cb94d5ae5a50234966535b4 (patch) | |
| tree | 165763af633fbe4c94e45f658b3ae532092cf1ba /webapp | |
| parent | ac2f75ac8fd4e2d7ae1de6703a156b9636d4b8f0 (diff) | |
| download | chat-3ef26de2ac9789407cb94d5ae5a50234966535b4.tar.gz chat-3ef26de2ac9789407cb94d5ae5a50234966535b4.tar.bz2 chat-3ef26de2ac9789407cb94d5ae5a50234966535b4.zip | |
Marked Office 365 SSO through OAuth2 as beta (#3781)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/oauth_settings.jsx | 2 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/oauth_settings.jsx b/webapp/components/admin_console/oauth_settings.jsx index 92663ece8..1f377bcc3 100644 --- a/webapp/components/admin_console/oauth_settings.jsx +++ b/webapp/components/admin_console/oauth_settings.jsx @@ -406,7 +406,7 @@ export default class OAuthSettings extends AdminSettings { oauthTypes.push({value: Constants.GOOGLE_SERVICE, text: Utils.localizeMessage('admin.oauth.google', 'Google Apps')}); } if (global.window.mm_license.Office365SSO === 'true') { - oauthTypes.push({value: Constants.OFFICE365_SERVICE, text: Utils.localizeMessage('admin.oauth.office365', 'Office 365')}); + oauthTypes.push({value: Constants.OFFICE365_SERVICE, text: Utils.localizeMessage('admin.oauth.office365', 'Office 365 (Beta)')}); } } diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 478fbf362..b37b7a5d5 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -477,7 +477,7 @@ "admin.oauth.gitlab": "GitLab", "admin.oauth.google": "Google Apps", "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider", - "admin.oauth.office365": "Office 365", + "admin.oauth.office365": "Office 365 (Beta)", "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.oauth.select": "Select OAuth 2.0 service provider:", |