Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a17e7cae

Commit a17e7cae authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'erikj/shared_secret' into erikj/test2

parents 8f8798bc 76b18df3

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

scripts/register_new_matrix_user 26 additions, 6 deletions

scripts/register_new_matrix_user
synapse/api/errors.py 2 additions, 1 deletion

synapse/api/errors.py
synapse/config/password.py 4 additions, 0 deletions

synapse/config/password.py
synapse/handlers/auth.py 4 additions, 2 deletions

synapse/handlers/auth.py
synapse/handlers/identity.py 27 additions, 14 deletions

synapse/handlers/identity.py
synapse/handlers/register.py 3 additions, 1 deletion

synapse/handlers/register.py
synapse/rest/client/v1/register.py 16 additions, 4 deletions

synapse/rest/client/v1/register.py
synapse/storage/event_push_actions.py 9 additions, 9 deletions

synapse/storage/event_push_actions.py
synapse/storage/registration.py 29 additions, 23 deletions

synapse/storage/registration.py
synapse/storage/stream.py 93 additions, 51 deletions

synapse/storage/stream.py

with 213 additions and 111 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