Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

3f534d3f

Commit 3f534d3f authored 4 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'social_login_hotfixes' into develop

parents e4cdecb3 17f2a512

Branches

Tags

Loading

Changes 25

Hide whitespace changes

Inline Side-by-side

Showing

synapse/res/templates/sso_login_idp_picker.html 52 additions, 22 deletions

synapse/res/templates/sso_login_idp_picker.html
synapse/res/templates/sso_new_user_consent.html 4 additions, 11 deletions

synapse/res/templates/sso_new_user_consent.html
synapse/res/templates/sso_partial_profile.html 19 additions, 0 deletions

synapse/res/templates/sso_partial_profile.html
synapse/res/templates/sso_redirect_confirm.html 23 additions, 19 deletions

synapse/res/templates/sso_redirect_confirm.html
tests/rest/client/v1/test_login.py 12 additions, 4 deletions

tests/rest/client/v1/test_login.py

with 110 additions and 56 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment