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 |
|
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 |
|
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
|
83172487b0
|
Add basic filtering public API unit tests. Use defers in the right places.
|
2015-01-29 12:20:59 +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 |
|
Kegan Dougal
|
2a4fda7b88
|
Add filtering.filter_events function, with stub passes_filter function.
|
2015-01-29 09:27:16 +00:00 |
|
Kegan Dougal
|
3773759c0f
|
Also edit the filter column on the delta SQL
|
2015-01-29 09:15:33 +00:00 |
|
Mark Haines
|
e3e72b8c5c
|
Remove typing TODO
|
2015-01-29 03:35:25 +00:00 |
|
Mark Haines
|
3dbce6f4a5
|
Add typing notifications to sync
|
2015-01-29 03:33:51 +00:00 |
|
Mark Haines
|
b9c442c85c
|
Include transaction ids in unsigned section of events in the sync results for the clients that made those requests
|
2015-01-29 02:46:00 +00:00 |
|
Mark Haines
|
1b4a164c02
|
Add support for formatting events in the way a v2 client expects
|
2015-01-29 02:34:35 +00:00 |
|
Mark Haines
|
b0b80074e0
|
SYN-252: Supply the stream and topological parts in the correct order to the constructor
|
2015-01-29 01:48:48 +00:00 |
|
David Baker
|
d5bdf3c0c7
|
Allow the push rule delete method to take more specifiers.
|
2015-01-28 18:06:04 +00:00 |
|
David Baker
|
8552ed8df2
|
Change uses of get_user_by_req because it returns a tuple now.
|
2015-01-28 18:04:40 +00:00 |
|
Kegan Dougal
|
11634017f4
|
s/definition/filter_json/ since definition is now used to mean a component of the filter, rather than the complete json
|
2015-01-28 17:42:19 +00:00 |
|
Mark Haines
|
c81a19552f
|
Add ports back to demo/start.sh
|
2015-01-28 17:32:49 +00:00 |
|
Mark Haines
|
9c61556504
|
Merge branch 'develop' into client_v2_sync
|
2015-01-28 17:29:30 +00:00 |
|
Mark Haines
|
26c8fff19e
|
Merge pull request #36 from matrix-org/device_id_from_access_token
Extract the device id and token id from the access token when autheniticating users
|
2015-01-28 17:19:28 +00:00 |
|
Mark Haines
|
3cca61e006
|
Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier
|
2015-01-28 17:16:12 +00:00 |
|
Mark Haines
|
c18e551640
|
Add a : to the doc string after the type of the return value
|
2015-01-28 17:08:53 +00:00 |
|
Mark Haines
|
388581e087
|
Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events
|
2015-01-28 16:58:23 +00:00 |
|
Kegan Dougal
|
c23e3db544
|
Add filter JSON sanity checks.
|
2015-01-28 16:45:18 +00:00 |
|
David Baker
|
6840e7cece
|
Merge branch 'master' into develop
|
2015-01-28 16:03:35 +00:00 |
|
David Baker
|
60b143a52e
|
Move pushers delta to v12 and bump schema version
|
2015-01-28 15:48:28 +00:00 |
|
Mark Haines
|
c59bcabf0b
|
Return the device_id from get_auth_by_req
|
2015-01-28 15:43:41 +00:00 |
|
David Baker
|
e78dd33292
|
Use %s instead of +
|
2015-01-28 14:52:58 +00:00 |
|
David Baker
|
93aac9bb7b
|
Newline
|
2015-01-28 14:51:01 +00:00 |
|
David Baker
|
445ad9941e
|
Redundant parens
|
2015-01-28 14:49:59 +00:00 |
|
David Baker
|
6d485dd1c7
|
unnecessary newlines
|
2015-01-28 14:48:42 +00:00 |
|
David Baker
|
fb0928097a
|
More magic commas (including the place I copied it from...)
|
2015-01-28 14:48:07 +00:00 |