Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

d8f47d2e

Commit d8f47d2e authored 7 years ago by Erik Johnston Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #2280 from matrix-org/erikj/share_room_user_dir

Include users who you share a room with in user directory

parents 0a9315bb a9d6fa8b

Branches

Tags

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/user_directory.py 203 additions, 27 deletions

synapse/handlers/user_directory.py
synapse/rest/client/v2_alpha/user_directory.py 6 additions, 2 deletions

synapse/rest/client/v2_alpha/user_directory.py
synapse/storage/prepare_database.py 1 addition, 1 deletion

synapse/storage/prepare_database.py
synapse/storage/schema/delta/43/user_share.sql 32 additions, 0 deletions

synapse/storage/schema/delta/43/user_share.sql
synapse/storage/user_directory.py 266 additions, 30 deletions

synapse/storage/user_directory.py

with 508 additions and 60 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