Erik Johnston
|
464e1fcfa5
|
Merge branch 'master' of github.com:matrix-org/synapse into release-v0.2.0
Conflicts:
synapse/notifier.py
webclient/room/room-controller.js
webclient/room/room.html
|
2014-09-02 15:26:11 +01:00 |
|
Paul "LeoNerd" Evans
|
eec67a675f
|
Have EventSource's get_new_events_for_user() API work only on keys within that source, not overall eventstream tokens
|
2014-08-29 19:13:55 +01:00 |
|
Erik Johnston
|
f07f538ac7
|
When notifying listeners, don't do so in a serial fashion
|
2014-08-29 16:01:01 +01:00 |
|
Erik Johnston
|
8113eb7c79
|
Turn of trace_function logging
|
2014-08-28 18:45:00 +01:00 |
|
Erik Johnston
|
eb3094ed31
|
And more logging.
|
2014-08-28 15:58:38 +01:00 |
|
Erik Johnston
|
410a74b0f3
|
If timeout=0, return immediately
|
2014-08-27 17:21:48 +01:00 |
|
Erik Johnston
|
226025e9ca
|
Comments!
|
2014-08-27 17:04:47 +01:00 |
|
Erik Johnston
|
bfe9faad5a
|
Index sources in a nicer fashion.
|
2014-08-27 15:33:52 +01:00 |
|
Erik Johnston
|
bd16b93e8f
|
Implement presence event source. Change the way the notifier indexes listeners
|
2014-08-27 14:03:27 +01:00 |
|
Erik Johnston
|
67c5f89244
|
Enable presence again. Fix up api to match old api.
|
2014-08-26 19:40:29 +01:00 |
|
Erik Johnston
|
3a2a5b959c
|
WIP: Completely change how event streaming and pagination work. This reflects the change in the underlying storage model.
|
2014-08-26 18:57:46 +01:00 |