Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_auth
Showing
- .gitignore 4 additions, 4 deletions.gitignore
- CHANGES.rst 83 additions, 0 deletionsCHANGES.rst
- docs/workers.rst 1 addition, 0 deletionsdocs/workers.rst
- jenkins-dendron-postgres.sh 2 additions, 0 deletionsjenkins-dendron-postgres.sh
- res/templates/notif_mail.html 3 additions, 1 deletionres/templates/notif_mail.html
- scripts/synapse_port_db 9 additions, 0 deletionsscripts/synapse_port_db
- synapse/__init__.py 1 addition, 1 deletionsynapse/__init__.py
- synapse/api/auth.py 28 additions, 19 deletionssynapse/api/auth.py
- synapse/app/appservice.py 1 addition, 0 deletionssynapse/app/appservice.py
- synapse/app/client_reader.py 216 additions, 0 deletionssynapse/app/client_reader.py
- synapse/app/federation_reader.py 1 addition, 0 deletionssynapse/app/federation_reader.py
- synapse/app/media_repository.py 1 addition, 0 deletionssynapse/app/media_repository.py
- synapse/app/pusher.py 3 additions, 2 deletionssynapse/app/pusher.py
- synapse/app/synchrotron.py 7 additions, 0 deletionssynapse/app/synchrotron.py
- synapse/app/synctl.py 1 addition, 1 deletionsynapse/app/synctl.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/server.py 0 additions, 9 deletionssynapse/config/server.py
- synapse/config/tls.py 38 additions, 0 deletionssynapse/config/tls.py
Loading
Please register or sign in to comment