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
|
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 |
|
David Baker
|
8552ed8df2
|
Change uses of get_user_by_req because it returns a tuple now.
|
2015-01-28 18:04:40 +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
|
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 |
|
Mark Haines
|
c59bcabf0b
|
Return the device_id from get_auth_by_req
|
2015-01-28 15:43:41 +00:00 |
|
David Baker
|
2cfdfee572
|
spaces
|
2015-01-28 14:41:51 +00:00 |
|
David Baker
|
289a249874
|
Unnecessary newlines.
|
2015-01-28 14:39:03 +00:00 |
|
David Baker
|
3cb5b73c0d
|
Unnecessary newline.
|
2015-01-28 14:37:55 +00:00 |
|
David Baker
|
8807f4170e
|
Better style
|
2015-01-28 14:35:00 +00:00 |
|
David Baker
|
032f8d4ed3
|
Another superfluous newline
|
2015-01-28 14:33:15 +00:00 |
|
David Baker
|
d93ce29a86
|
Ah, the comma of doom.
|
2015-01-28 14:27:01 +00:00 |
|
David Baker
|
6741c3dbd9
|
Brackets are nicer
|
2015-01-28 14:26:03 +00:00 |
|
David Baker
|
4fbf2328c2
|
Unnecessary new line
|
2015-01-28 14:24:28 +00:00 |
|
David Baker
|
20c47383dc
|
Oops, bad merge: needed to change the base class of the rest servlets too.
|
2015-01-28 14:10:46 +00:00 |
|
David Baker
|
c291a4d522
|
Merge branch 'develop' into pushers
Conflicts:
synapse/handlers/events.py
synapse/server.py
|
2015-01-28 12:51:05 +00:00 |
|
Mark Haines
|
e020574d65
|
Fix Formatting
|
2015-01-27 20:19:36 +00:00 |
|
Paul "LeoNerd" Evans
|
059651efa1
|
Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely
|
2015-01-27 16:17:56 +00:00 |
|
Paul "LeoNerd" Evans
|
05c7cba73a
|
Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there
|
2015-01-27 14:28:56 +00:00 |
|
Paul "LeoNerd" Evans
|
0484d7f6e9
|
Merge branch 'develop' into client_v2_filter
|
2015-01-27 13:11:03 +00:00 |
|
Mark Haines
|
436513068d
|
Start implementing the non-incremental sync portion of the v2 /sync API
|
2015-01-26 18:53:31 +00:00 |
|
Mark Haines
|
3186c5bdbc
|
Merge branch 'develop' into client_v2_sync
|
2015-01-26 16:32:40 +00:00 |
|
Mark Haines
|
7f6f3f9d62
|
Pass the current time to serialize event, rather than passing an
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
|
2015-01-26 16:11:28 +00:00 |
|
Paul "LeoNerd" Evans
|
8d7accb28f
|
Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no actual filter implementation
|
2015-01-26 14:33:30 +00:00 |
|
Mark Haines
|
7b814d3f7f
|
Add client v2_alpha resource to synapse server resource tree
|
2015-01-23 18:55:19 +00:00 |
|
Mark Haines
|
e26340cee7
|
Start implementing the v2_alpha sync API
|
2015-01-23 18:48:17 +00:00 |
|
David Baker
|
5f84ba8ea1
|
Add API to delete push rules.
|
2015-01-23 17:49:37 +00:00 |
|
David Baker
|
f21f9fa3c5
|
Use push settings!
|
2015-01-23 17:07:06 +00:00 |
|
Mark Haines
|
4be637cb12
|
Extract the client v1 base RestServlet to a separate class
|
2015-01-23 14:09:51 +00:00 |
|
David Baker
|
b3f66ea6fb
|
more pep8
|
2015-01-23 13:28:00 +00:00 |
|
David Baker
|
d3e72b4d87
|
Make string format tuple an actual tuple
|
2015-01-23 13:25:58 +00:00 |
|
David Baker
|
98e1080555
|
redundant parens
|
2015-01-23 13:25:36 +00:00 |
|
David Baker
|
54c689c819
|
stray space
|
2015-01-23 13:25:14 +00:00 |
|
David Baker
|
6188c4f69c
|
make per-device rules work
|
2015-01-23 13:23:10 +00:00 |
|
Mark Haines
|
ada711504e
|
Replace hs.parse_roomalias with RoomAlias.from_string
|
2015-01-23 13:21:58 +00:00 |
|
Mark Haines
|
1c06c48ce2
|
Replace hs.parse_roomid with RoomID.from_string
|
2015-01-23 11:55:12 +00:00 |
|
Mark Haines
|
5759bec43c
|
Replace hs.parse_userid with UserID.from_string
|
2015-01-23 11:47:15 +00:00 |
|
David Baker
|
49fe31792b
|
Add slightly pedantic trailing slash error.
|
2015-01-23 11:19:02 +00:00 |
|
Mark Haines
|
7256def8e4
|
Merge rest servlets into the client json resource object
|
2015-01-23 10:37:38 +00:00 |
|
David Baker
|
bcd48b9636
|
Fix adding rules without before/after & add the rule that we couldn't find to the error
|
2015-01-23 10:28:25 +00:00 |
|
David Baker
|
6927b6b197
|
This really serves me right for ever making a map called 'map'.
|
2015-01-23 10:21:47 +00:00 |
|
David Baker
|
8a850573c9
|
As yet fairly untested GET API for push rules
|
2015-01-22 19:32:17 +00:00 |
|
David Baker
|
5c6189ea3e
|
Merge branch 'develop' into pushers
Conflicts:
synapse/rest/__init__.py
|
2015-01-22 17:46:16 +00:00 |
|
Mark Haines
|
97c68c508d
|
Move rest APIs back under the rest directory
|
2015-01-22 16:10:07 +00:00 |