Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

7a072632

Commit 7a072632 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents ecabff7e 1c6825cc

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 16 additions, 0 deletions

CHANGES.rst
VERSION 1 addition, 1 deletion

VERSION
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/handlers/register.py 1 addition, 2 deletions

synapse/handlers/register.py
webclient/app.js 1 addition, 0 deletions

webclient/app.js
webclient/components/matrix/event-handler-service.js 20 additions, 84 deletions

webclient/components/matrix/event-handler-service.js
webclient/components/matrix/notification-service.js 104 additions, 0 deletions

webclient/components/matrix/notification-service.js
webclient/index.html 1 addition, 0 deletions

webclient/index.html
webclient/room/room-controller.js 26 additions, 12 deletions

webclient/room/room-controller.js
webclient/room/room.html 1 addition, 1 deletion

webclient/room/room.html

with 172 additions and 101 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