diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-11 13:46:24 -0500 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-11 13:46:24 -0500 |
| commit | c6d5448c7540e06a78063b6b363b41a261fd66c3 (patch) | |
| tree | 8c9b39ea9917c1b7e0d0b7aac1a8d11c5583f2f6 /webapp/components/admin_console/oauth_settings.jsx | |
| parent | a6bb9b87f7b9208ece16aa28816803763ab0ae80 (diff) | |
| parent | 20735470185e0b0ac1d15b975041ed9a2e0e43bc (diff) | |
| download | chat-c6d5448c7540e06a78063b6b363b41a261fd66c3.tar.gz chat-c6d5448c7540e06a78063b6b363b41a261fd66c3.tar.bz2 chat-c6d5448c7540e06a78063b6b363b41a261fd66c3.zip | |
Merge branch 'release-3.3' RC5
Diffstat (limited to 'webapp/components/admin_console/oauth_settings.jsx')
| -rw-r--r-- | webapp/components/admin_console/oauth_settings.jsx | 4 |
1 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 1f377bcc3..716889401 100644 --- a/webapp/components/admin_console/oauth_settings.jsx +++ b/webapp/components/admin_console/oauth_settings.jsx @@ -402,10 +402,10 @@ export default class OAuthSettings extends AdminSettings { oauthTypes.push({value: 'off', text: Utils.localizeMessage('admin.oauth.off', 'Do not allow sign-in via an OAuth 2.0 provider.')}); oauthTypes.push({value: Constants.GITLAB_SERVICE, text: Utils.localizeMessage('admin.oauth.gitlab', 'GitLab')}); if (global.window.mm_license.IsLicensed === 'true') { - if (global.window.mm_license.GoogleSSO === 'true') { + if (global.window.mm_license.GoogleOAuth === 'true') { oauthTypes.push({value: Constants.GOOGLE_SERVICE, text: Utils.localizeMessage('admin.oauth.google', 'Google Apps')}); } - if (global.window.mm_license.Office365SSO === 'true') { + if (global.window.mm_license.Office365OAuth === 'true') { oauthTypes.push({value: Constants.OFFICE365_SERVICE, text: Utils.localizeMessage('admin.oauth.office365', 'Office 365 (Beta)')}); } } |