Erik Johnston
|
6837c5edab
|
Handle the case when things return empty but non none things
|
2015-05-19 14:27:11 +01:00 |
Erik Johnston
|
7223129916
|
Don't apply new room join hack if depth > 5
|
2015-05-19 14:16:08 +01:00 |
Erik Johnston
|
5ae4a84211
|
Don't always hit get_server_verify_key_v1_direct
|
2015-05-19 13:43:34 +01:00 |
Erik Johnston
|
118a760719
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 13:20:29 +01:00 |
David Baker
|
19505e0392
|
Disable GZip encoding on static file resources as per comment
|
2015-05-19 13:20:25 +01:00 |
Erik Johnston
|
df431b127b
|
Add forgotten .items()
|
2015-05-19 13:14:21 +01:00 |
Erik Johnston
|
882ac83d8d
|
Fix scripts-dev/convert_server_keys.py to have correct format
|
2015-05-19 13:12:55 +01:00 |
Erik Johnston
|
d3e09f12d0
|
SYN-383: Actually, we expect this value to be a dict
|
2015-05-19 13:12:41 +01:00 |
Erik Johnston
|
677be13ffc
|
Revert accidental commit
|
2015-05-19 13:12:28 +01:00 |
Erik Johnston
|
350b88656a
|
SYN-383: Actually, we expect this value to be a dict
|
2015-05-19 13:01:57 +01:00 |
Erik Johnston
|
9de94d5a4d
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 12:50:17 +01:00 |
Erik Johnston
|
2b7120e233
|
SYN-383: Handle the fact the server might not have signed things
|
2015-05-19 12:49:38 +01:00 |
Erik Johnston
|
8b256a7296
|
Don't reuse var names
|
2015-05-19 11:58:22 +01:00 |
Erik Johnston
|
62ccc6d95f
|
Don't reuse var names
|
2015-05-19 11:58:04 +01:00 |
Erik Johnston
|
01858bcbf2
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 11:56:35 +01:00 |
Erik Johnston
|
2aeee2a905
|
SYN-383: Fix parsing of verify_keys and catching of _DefGen_Return
|
2015-05-19 11:56:18 +01:00 |
Erik Johnston
|
5e7883ec19
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
|
2015-05-19 10:50:43 +01:00 |
Mark Haines
|
c6a03c46e6
|
SYN-383: Extract the response list from 'server_keys' in the response JSON as it might work better than iterating over the top level dict
|
2015-05-19 10:23:02 +01:00 |
Mark Haines
|
99914ec9f8
|
Merge pull request #152 from matrix-org/notifier_performance
Notifier performance
|
2015-05-18 17:49:59 +01:00 |
Erik Johnston
|
ef910a0358
|
Do work in parellel when joining a room
|
2015-05-18 17:17:04 +01:00 |
Mark Haines
|
9396723995
|
Merge pull request #154 from matrix-org/erikj/events_move
Move get_events functions to storage.events
|
2015-05-18 14:24:35 +01:00 |
Mark Haines
|
ad31fa3040
|
Don't bother sorting by the room_stream_ids, it shouldn't matter which order they are notified in
|
2015-05-18 14:04:58 +01:00 |
Mark Haines
|
0b0033c40b
|
Merge branch 'develop' into notifier_performance
|
2015-05-18 13:50:01 +01:00 |
Mark Haines
|
1e90715a3d
|
Make sure the notifier stream token goes forward when it is updated. Sort the pending events by the correct room_stream_id
|
2015-05-18 13:17:36 +01:00 |
Erik Johnston
|
10f1bdb9a2
|
Move get_events functions to storage.events
|
2015-05-18 10:21:40 +01:00 |
Mark Haines
|
10be983f2c
|
Merge pull request #153 from matrix-org/markjh/presence_docstring
Add some doc strings for presence.
|
2015-05-15 11:11:47 +01:00 |
Mark Haines
|
415b158ce2
|
More whitespace
|
2015-05-15 11:09:47 +01:00 |
Mark Haines
|
0a4330cd5d
|
Add some missed argument types, cleanup the whitespace a bit
|
2015-05-14 17:48:12 +01:00 |
Mark Haines
|
47ec693e29
|
More doc-strings
|
2015-05-14 17:07:02 +01:00 |
David Baker
|
6e1ad283cf
|
Support gzip encoding for client, client v2 and web client resources (SYN-176).
|
2015-05-14 16:39:19 +01:00 |
Mark Haines
|
c5d1b4986b
|
Remove unused arguments and doc PresenceHandler.push_update_to_clients
|
2015-05-14 14:59:31 +01:00 |
Mark Haines
|
0ad1c67234
|
Add some doc-strings to notifier
|
2015-05-14 14:35:07 +01:00 |
David Baker
|
67800f7626
|
Treat setting your display name to the empty string as removing it (SYN-186).
|
2015-05-14 14:19:59 +01:00 |
Mark Haines
|
4770cec7bc
|
Merge pull request #150 from matrix-org/notifier_unify
Make v1 and v2 client APIs interact with the notifier in the same way.
|
2015-05-14 14:16:59 +01:00 |
David Baker
|
92e1c8983d
|
Disallow whitespace in aliases here too
|
2015-05-14 13:21:55 +01:00 |
David Baker
|
0c894e1ebd
|
Throw error when creating room if alias contains whitespace #SYN-335
|
2015-05-14 13:11:28 +01:00 |
Mark Haines
|
084c365c3a
|
Use the current token when timing out a notifier, make sure the user_id is a string in on_new_user_event
|
2015-05-14 12:03:26 +01:00 |
David Baker
|
c37a6e151f
|
Make shared secret registration work again
|
2015-05-14 12:03:13 +01:00 |
David Baker
|
7c549dd557
|
Add ID generator for push_rules_enable to #resolve SYN-378
|
2015-05-14 11:44:03 +01:00 |
Mark Haines
|
899d4675dd
|
Merge branch 'notifier_unify' into notifier_performance
|
2015-05-14 11:36:44 +01:00 |
Mark Haines
|
243c56e725
|
Merge branch 'develop' into notifier_unify
|
2015-05-14 11:36:23 +01:00 |
Mark Haines
|
3edd2d5c93
|
Fix v2 sync, update the last_notified_ms only if there was an active listener
|
2015-05-14 11:25:30 +01:00 |
David Baker
|
47fb089eb5
|
Specify python 2.7 in the virtualenv setup (SYN-319) #resolved
|
2015-05-14 10:23:10 +01:00 |
Mark Haines
|
5e0c533672
|
Fix metric counter
|
2015-05-13 17:20:28 +01:00 |
Mark Haines
|
f1b83d88a3
|
Discard unused NotifierUserStreams
|
2015-05-13 16:54:02 +01:00 |
Mark Haines
|
9af432257d
|
Don't set a timer if there's already a result to return
|
2015-05-13 15:42:13 +01:00 |
Mark Haines
|
df6db5c802
|
Don't bother checking for new events from a source if the stream token hasn't advanced for that source
|
2015-05-13 15:08:24 +01:00 |
Mark Haines
|
63878c0379
|
Don't bother checking for updates if the stream token hasn't advanced for a user
|
2015-05-13 13:42:21 +01:00 |
Mark Haines
|
cffe6057fb
|
Merge branch 'notifier_unify' into notifier_performance
Conflicts:
synapse/notifier.py
|
2015-05-12 16:37:50 +01:00 |
Erik Johnston
|
80fd2b574c
|
Don't talk to yourself when backfilling
|
2015-05-12 16:19:46 +01:00 |