Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

33646eb0

Commit 33646eb0 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search

parents 380f148d 524b708f

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/auth.py 71 additions, 2 deletions

synapse/api/auth.py
synapse/api/constants.py 1 addition, 0 deletions

synapse/api/constants.py
synapse/federation/federation_client.py 8 additions, 2 deletions

synapse/federation/federation_client.py
synapse/federation/federation_server.py 16 additions, 3 deletions

synapse/federation/federation_server.py
synapse/federation/transport/client.py 3 additions, 2 deletions

synapse/federation/transport/client.py
synapse/federation/transport/server.py 1 addition, 1 deletion

synapse/federation/transport/server.py
synapse/handlers/_base.py 11 additions, 0 deletions

synapse/handlers/_base.py
synapse/handlers/federation.py 14 additions, 4 deletions

synapse/handlers/federation.py
synapse/handlers/room.py 167 additions, 1 deletion

synapse/handlers/room.py
synapse/http/client.py 0 additions, 4 deletions

synapse/http/client.py
synapse/rest/client/v1/room.py 31 additions, 5 deletions

synapse/rest/client/v1/room.py
synapse/storage/filtering.py 1 addition, 1 deletion

synapse/storage/filtering.py
synapse/util/third_party_invites.py 69 additions, 0 deletions

synapse/util/third_party_invites.py

with 393 additions and 25 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