Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging
Conflicts: synapse/handlers/presence.py
Showing
- cmdclient/console.py 7 additions, 2 deletionscmdclient/console.py
- docs/specification.rst 265 additions, 165 deletionsdocs/specification.rst
- synapse/federation/replication.py 2 additions, 1 deletionsynapse/federation/replication.py
- synapse/handlers/_base.py 1 addition, 1 deletionsynapse/handlers/_base.py
- synapse/handlers/federation.py 17 additions, 36 deletionssynapse/handlers/federation.py
- synapse/handlers/presence.py 14 additions, 2 deletionssynapse/handlers/presence.py
- synapse/handlers/typing.py 2 additions, 1 deletionsynapse/handlers/typing.py
- synapse/rest/login.py 1 addition, 1 deletionsynapse/rest/login.py
- synapse/server.py 0 additions, 5 deletionssynapse/server.py
- synapse/util/logutils.py 2 additions, 0 deletionssynapse/util/logutils.py
- tests/handlers/test_federation.py 8 additions, 2 deletionstests/handlers/test_federation.py
- tests/handlers/test_presence.py 33 additions, 12 deletionstests/handlers/test_presence.py
- tests/handlers/test_presencelike.py 0 additions, 3 deletionstests/handlers/test_presencelike.py
- tests/rest/test_presence.py 0 additions, 2 deletionstests/rest/test_presence.py
- tests/utils.py 25 additions, 0 deletionstests/utils.py
- webclient/components/matrix/event-handler-service.js 21 additions, 9 deletionswebclient/components/matrix/event-handler-service.js
- webclient/components/matrix/event-stream-service.js 7 additions, 8 deletionswebclient/components/matrix/event-stream-service.js
- webclient/home/home-controller.js 2 additions, 2 deletionswebclient/home/home-controller.js
- webclient/recents/recents-controller.js 23 additions, 9 deletionswebclient/recents/recents-controller.js
- webclient/room/room-controller.js 53 additions, 28 deletionswebclient/room/room-controller.js
Loading
Please register or sign in to comment