Merge branch 'social_login' into develop

This commit is contained in:
Richard van der Hoff 2021-02-01 17:28:37 +00:00
commit 18ab35284a
33 changed files with 860 additions and 318 deletions

View file

@ -151,7 +151,8 @@ class OIDCConfig(Config):
#
# localpart_template: Jinja2 template for the localpart of the MXID.
# If this is not set, the user will be prompted to choose their
# own username.
# own username (see 'sso_auth_account_details.html' in the 'sso'
# section of this file).
#
# display_name_template: Jinja2 template for the display name to set
# on first login. If unset, no displayname will be set.