diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-07-29 14:58:37 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-07-29 14:58:37 -0400 |
commit | 3f8dda6f5ad676c976fd5ae575a6790fdb505449 (patch) | |
tree | 015a739989103ce38481176fd5d55f5f703789cb /webapp/routes/route_admin_console.jsx | |
parent | 748fdef1fbded624a786533e8f065b91a047b91c (diff) | |
download | chat-3f8dda6f5ad676c976fd5ae575a6790fdb505449.tar.gz chat-3f8dda6f5ad676c976fd5ae575a6790fdb505449.tar.bz2 chat-3f8dda6f5ad676c976fd5ae575a6790fdb505449.zip |
PLT-3633 EE: Add Google and Office365 SSO through OAuth2 (#3660)
* EE: Add Google and Office365 SSO through OAuth2
* Add localization strings
* Text tweaks for PLT-3633
* Added sign-up button for Office 365
* Updated some error messages and a bit of licensing
* Updated sign-in method section in user settings to include Google and Office365
* Added more localization strings
Diffstat (limited to 'webapp/routes/route_admin_console.jsx')
-rw-r--r-- | webapp/routes/route_admin_console.jsx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/webapp/routes/route_admin_console.jsx b/webapp/routes/route_admin_console.jsx index 1465bfa6b..291ba65f8 100644 --- a/webapp/routes/route_admin_console.jsx +++ b/webapp/routes/route_admin_console.jsx @@ -14,6 +14,7 @@ import PolicySettings from 'components/admin_console/policy_settings.jsx'; import LogSettings from 'components/admin_console/log_settings.jsx'; import EmailAuthenticationSettings from 'components/admin_console/email_authentication_settings.jsx'; import GitLabSettings from 'components/admin_console/gitlab_settings.jsx'; +import OAuthSettings from 'components/admin_console/oauth_settings.jsx'; import LdapSettings from 'components/admin_console/ldap_settings.jsx'; import SamlSettings from 'components/admin_console/saml_settings.jsx'; import SignupSettings from 'components/admin_console/signup_settings.jsx'; @@ -89,6 +90,10 @@ export default ( component={GitLabSettings} /> <Route + path='oauth' + component={OAuthSettings} + /> + <Route path='ldap' component={LdapSettings} /> |