Erik Johnston
|
875a481a1e
|
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage
|
2015-01-30 14:04:53 +00:00 |
|
Erik Johnston
|
7a9f6f083e
|
Remove commented line
|
2015-01-30 13:55:46 +00:00 |
|
Erik Johnston
|
76d7fd39cd
|
Style changes.
|
2015-01-30 13:52:02 +00:00 |
|
Mark Haines
|
8fe39a0311
|
Check if the user has joined the room between incremental syncs
|
2015-01-30 13:38:34 +00:00 |
|
Erik Johnston
|
a70a801184
|
Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.
|
2015-01-30 13:34:01 +00:00 |
|
Mark Haines
|
4a67834bc8
|
Pass client info to the sync_config
|
2015-01-30 11:50:15 +00:00 |
|
Mark Haines
|
c562f237f6
|
Unused import
|
2015-01-30 11:43:00 +00:00 |
|
Mark Haines
|
8498d348d8
|
Fix token formatting
|
2015-01-30 11:42:09 +00:00 |
|
Mark Haines
|
e97de6d96a
|
Filter the recent events before applying the limit when doing an initial sync
|
2015-01-30 11:35:20 +00:00 |
|
Mark Haines
|
22dd1cde2d
|
Filter the recent events before applying the limit when doing an incremental sync with a gap
|
2015-01-30 11:32:35 +00:00 |
|
Erik Johnston
|
0adf3e5445
|
Revert accidental bumping of angluar_sdk dep
|
2015-01-30 11:17:09 +00:00 |
|
Erik Johnston
|
2c9e136d57
|
Fix bad merge fo python_dependencies.py
|
2015-01-30 11:14:33 +00:00 |
|
David Baker
|
bd03947c05
|
We do need Twisted 14, not 15: we use internal Twisted things that have been removed in 15.
|
2015-01-30 11:13:42 +00:00 |
|
Erik Johnston
|
2ebf795c0a
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
|
2015-01-30 11:10:37 +00:00 |
|
Erik Johnston
|
0c2d245fdf
|
Update the current state of an event if we update auth events.
|
2015-01-30 11:08:52 +00:00 |
|
Erik Johnston
|
823999716e
|
Fix bug in timeout handling in keyclient
|
2015-01-30 11:08:01 +00:00 |
|
Erik Johnston
|
c1d860870b
|
Fix regression where we no longer correctly handled the case of gaps in our event graph
|
2015-01-30 10:48:47 +00:00 |
|
Erik Johnston
|
c1c7b39827
|
Fix bug where we changes in outlier in metadata dict propogated to other events
|
2015-01-30 10:30:54 +00:00 |
|
David Baker
|
fc946f3b8d
|
Include content in notification pokes
|
2015-01-29 21:59:17 +00:00 |
|
David Baker
|
0b16886397
|
Change 'from' in notification pokes to 'sender' to match client API v2. Send sender display names where they exist.
|
2015-01-29 18:51:22 +00:00 |
|
David Baker
|
1235f7f383
|
Add default push rules including setting a sound for messages mentioning your username / display name
|
2015-01-29 18:38:22 +00:00 |
|
Mark Haines
|
ece828a7b7
|
Update todo for the filtering on sync
|
2015-01-29 18:15:24 +00:00 |
|
Mark Haines
|
365a186729
|
Add basic filtering support
|
2015-01-29 18:11:28 +00:00 |
|
Mark Haines
|
7ceda8bf3d
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 18:04:07 +00:00 |
|
Mark Haines
|
93ed31dda2
|
Create a separate filter object to do the actual filtering, so that we can
split the storage and management of filters from the actual filter code
and don't have to load a filter from the db each time we filter an event
|
2015-01-29 17:45:07 +00:00 |
|
David Baker
|
4bdfce30d7
|
Renumber priority classes so we can use 0 for defaults.
|
2015-01-29 17:12:11 +00:00 |
|
David Baker
|
e0d2c6889b
|
Allow kind to be set to null to delete a pusher.
|
2015-01-29 17:05:00 +00:00 |
|
Erik Johnston
|
78015948a7
|
Initial implementation of auth conflict resolution
|
2015-01-29 16:52:33 +00:00 |
|
Mark Haines
|
4ad45f2582
|
Fix indent
|
2015-01-29 16:41:49 +00:00 |
|
Mark Haines
|
722b65f461
|
Move typing notifs to an "emphermal" event list on the room object
|
2015-01-29 16:41:21 +00:00 |
|
Mark Haines
|
cc42d3f907
|
Fix check for empty room update
|
2015-01-29 16:27:38 +00:00 |
|
Mark Haines
|
4d9dd9bdc0
|
Fix v2 initial sync
|
2015-01-29 16:23:03 +00:00 |
|
Mark Haines
|
8e571cbed8
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 16:18:59 +00:00 |
|
Mark Haines
|
295322048d
|
Merge branch 'develop' into client_v2_filter
|
2015-01-29 16:18:34 +00:00 |
|
Mark Haines
|
acb68a39e0
|
Code style fixes.
|
2015-01-29 16:12:40 +00:00 |
|
David Baker
|
8b1dd9f57f
|
Only send a badge-reset if the user actually has unread notifications.
|
2015-01-29 16:10:01 +00:00 |
|
Mark Haines
|
9150a0d62e
|
Fix code-style
|
2015-01-29 16:01:14 +00:00 |
|
Mark Haines
|
cf7c54ec93
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 15:55:58 +00:00 |
|
Mark Haines
|
33391db5f8
|
Merge in auth changes from develop
|
2015-01-29 15:54:54 +00:00 |
|
Mark Haines
|
396a67a09a
|
Merge branch 'client_v2_filter' into client_v2_sync
Conflicts:
synapse/rest/client/v2_alpha/__init__.py
|
2015-01-29 14:58:00 +00:00 |
|
Mark Haines
|
9d8f798a3f
|
Merge changes from develop
|
2015-01-29 14:55:27 +00:00 |
|
Mark Haines
|
e4f50fa0aa
|
Move bump schema delta
|
2015-01-29 14:53:18 +00:00 |
|
Mark Haines
|
e016f4043b
|
Use get_room_events_stream to get changes to the rooms if the number of changes is small
|
2015-01-29 14:40:28 +00:00 |
|
Kegan Dougal
|
38b27bd2cb
|
Add filter_room_state unit tests.
|
2015-01-29 14:28:34 +00:00 |
|
Erik Johnston
|
5a3a15f5c1
|
Make post_json(...) actually send data.
|
2015-01-29 13:58:22 +00:00 |
|
Erik Johnston
|
c183cec8f6
|
Add post_json(...) method to federation client
|
2015-01-29 13:44:52 +00:00 |
|
Kegan Dougal
|
83172487b0
|
Add basic filtering public API unit tests. Use defers in the right places.
|
2015-01-29 12:20:59 +00:00 |
|
Kegan Dougal
|
5561a87920
|
Add more unit tests for the filter algorithm.
|
2015-01-29 12:06:16 +00:00 |
|
Kegan Dougal
|
777d9914b5
|
Implement filter algorithm. Add basic event type unit tests to assert it works.
|
2015-01-29 11:38:06 +00:00 |
|
Kegan Dougal
|
50de1eaad9
|
Add filtering public API; outline filtering algorithm.
|
2015-01-29 10:24:57 +00:00 |