diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
| commit | 75af5d4536cc414d171c2fe6dca78e455eb18b37 (patch) | |
| tree | 4e00cf97b5f4f570b1901093bfa4e208749932a0 /web/templates | |
| parent | d107b392a6309a41eac6cd7d07d720a21968eb56 (diff) | |
| parent | f5fec3a157e6c9146a0c4e28dd5f70e6c066affd (diff) | |
| download | chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.gz chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.bz2 chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.zip | |
Merge pull request #496 from mattermost/mm-2015
MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up.
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/signup_team.html | 2 | ||||
| -rw-r--r-- | web/templates/signup_user_oauth.html | 26 |
2 files changed, 1 insertions, 27 deletions
diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html index b896dedf5..8d9d6e0b8 100644 --- a/web/templates/signup_team.html +++ b/web/templates/signup_team.html @@ -22,7 +22,7 @@ </div> </div> <script> -window.setup_signup_team_page(); +window.setup_signup_team_page('{{.Props.AuthServices}}'); </script> </body> </html> diff --git a/web/templates/signup_user_oauth.html b/web/templates/signup_user_oauth.html deleted file mode 100644 index 2eddb50d2..000000000 --- a/web/templates/signup_user_oauth.html +++ /dev/null @@ -1,26 +0,0 @@ -{{define "signup_user_oauth"}} -<!DOCTYPE html> -<html> -{{template "head" . }} -<body class="white"> - <div class="container-fluid"> - <div class="inner__wrap"> - <div class="row content"> - <div class="col-sm-12"> - <div class="signup-team__container"> - <div id="signup-user-complete"></div> - </div> - </div> - <div class="footer-push"></div> - </div> - <div class="row footer"> - {{template "footer" . }} - </div> - </div> - </div> - <script> - window.setup_signup_user_oauth_page('{{.Props.User}}', '{{.Props.TeamName}}', '{{.Props.TeamDisplayName}}'); - </script> -</body> -</html> -{{end}} |