Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

32a453d7

Commit 32a453d7 authored 9 years ago by Daniel Wagner-Hall

Downloads
- Plain Diff

Merge branch 'develop' into daniel/3pidinvites

parents 7c809abe 42794390

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

AUTHORS.rst 4 additions, 1 deletion

AUTHORS.rst
synapse/config/cas.py 43 additions, 0 deletions

synapse/config/cas.py
synapse/config/homeserver.py 2 additions, 1 deletion

synapse/config/homeserver.py
synapse/handlers/auth.py 32 additions, 0 deletions

synapse/handlers/auth.py
synapse/handlers/events.py 52 additions, 35 deletions

synapse/handlers/events.py
synapse/handlers/message.py 8 additions, 5 deletions

synapse/handlers/message.py
synapse/handlers/presence.py 8 additions, 3 deletions

synapse/handlers/presence.py
synapse/http/client.py 34 additions, 17 deletions

synapse/http/client.py
synapse/push/__init__.py 1 addition, 1 deletion

synapse/push/__init__.py
synapse/rest/client/v1/initial_sync.py 3 additions, 1 deletion

synapse/rest/client/v1/initial_sync.py
synapse/rest/client/v1/login.py 105 additions, 1 deletion

synapse/rest/client/v1/login.py

with 292 additions and 65 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