Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_notifs
No related branches found
No related tags found
Showing
- .gitignore 4 additions, 4 deletions.gitignore
- synapse/api/auth.py 0 additions, 10 deletionssynapse/api/auth.py
- synapse/app/pusher.py 2 additions, 2 deletionssynapse/app/pusher.py
- synapse/config/homeserver.py 3 additions, 3 deletionssynapse/config/homeserver.py
- synapse/config/ldap.py 0 additions, 100 deletionssynapse/config/ldap.py
- synapse/config/password_auth_providers.py 61 additions, 0 deletionssynapse/config/password_auth_providers.py
- synapse/config/tls.py 38 additions, 0 deletionssynapse/config/tls.py
- synapse/handlers/auth.py 104 additions, 329 deletionssynapse/handlers/auth.py
- synapse/replication/resource.py 102 additions, 35 deletionssynapse/replication/resource.py
- synapse/rest/client/v2_alpha/auth.py 3 additions, 1 deletionsynapse/rest/client/v2_alpha/auth.py
- synapse/rest/client/v2_alpha/devices.py 20 additions, 5 deletionssynapse/rest/client/v2_alpha/devices.py
- synapse/rest/key/v2/local_key_resource.py 8 additions, 13 deletionssynapse/rest/key/v2/local_key_resource.py
- synapse/storage/room.py 3 additions, 0 deletionssynapse/storage/room.py
- synapse/util/ldap_auth_provider.py 368 additions, 0 deletionssynapse/util/ldap_auth_provider.py
- tests/replication/slave/storage/_base.py 2 additions, 1 deletiontests/replication/slave/storage/_base.py
- tests/replication/test_resource.py 1 addition, 2 deletionstests/replication/test_resource.py
- tests/storage/test_appservice.py 14 additions, 3 deletionstests/storage/test_appservice.py
- tests/utils.py 1 addition, 0 deletionstests/utils.py
Loading
Please register or sign in to comment