| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Spit out server default rules too. | David Baker | 2015-01-30 | 1 | -4/+12 |
| | | |||||
| * | Merge pull request #41 from matrix-org/client_v2_sync | Mark Haines | 2015-01-30 | 2 | -2/+209 |
| |\ | | | | | Client v2 sync | ||||
| | * | Pass client info to the sync_config | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| | | | |||||
| | * | Filter the recent events before applying the limit when doing an incremental ↵ | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| | | | | | | | | | sync with a gap | ||||
| | * | Add basic filtering support | Mark Haines | 2015-01-29 | 1 | -5/+14 |
| | | | |||||
| | * | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Move typing notifs to an "emphermal" event list on the room object | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 1 | -7/+22 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 4 | -5/+110 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py | ||||
| | * | | | | | Add typing notifications to sync | Mark Haines | 2015-01-29 | 1 | -10/+8 |
| | | | | | | | |||||
| | * | | | | | Include transaction ids in unsigned section of events in the sync results ↵ | Mark Haines | 2015-01-29 | 1 | -7/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | for the clients that made those requests | ||||
| | * | | | | | Add ports back to demo/start.sh | Mark Haines | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-28 | 11 | -41/+520 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fix Formatting | Mark Haines | 2015-01-27 | 1 | -3/+2 |
| | | | | | | | | |||||
| | * | | | | | | Start implementing the non-incremental sync portion of the v2 /sync API | Mark Haines | 2015-01-26 | 1 | -28/+77 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 2 | -2/+15 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Start implementing the v2_alpha sync API | Mark Haines | 2015-01-23 | 3 | -0/+214 |
| | | | | | | | | | |||||
| * | | | | | | | | Add glob asterisks when running rules. | David Baker | 2015-01-30 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Means that now you can't do exact matches even in override rules, but I think we can live with that. Advantage is that you'll now always get back what was put in to the API. | ||||
| * | | | | | | | | Merge pull request #37 from matrix-org/client_v2_filter | Erik Johnston | 2015-01-30 | 2 | -1/+110 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Client v2 filter | ||||
| | * | | | | | | | Create a separate filter object to do the actual filtering, so that we can | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | Merge branch 'develop' into client_v2_filter | Mark Haines | 2015-01-29 | 1 | -7/+22 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | | Merge changes from develop | Mark Haines | 2015-01-29 | 11 | -41/+520 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation nicely | ||||
| | * | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -13/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of user filters into there | ||||
| | * | | | | | | Merge branch 'develop' into client_v2_filter | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -2/+15 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ↵ | Paul "LeoNerd" Evans | 2015-01-26 | 2 | -1/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actual filter implementation | ||||
| * | | | | | | | Renumber priority classes so we can use 0 for defaults. | David Baker | 2015-01-29 | 1 | -5/+5 |
| | | | | | | | | |||||
| * | | | | | | | Allow kind to be set to null to delete a pusher. | David Baker | 2015-01-29 | 1 | -1/+10 |
| | |_|_|/ / / |/| | | | | | |||||
| * | | | | | | Code style fixes. | Mark Haines | 2015-01-29 | 1 | -7/+22 |
| | |_|/ / / |/| | | | | |||||
| * | | | | | Change uses of get_user_by_req because it returns a tuple now. | David Baker | 2015-01-28 | 2 | -4/+4 |
| | |_|_|/ |/| | | | |||||
| * | | | | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 8 | -39/+51 |
| |\ \ \ \ | | | | | | | | | | | Extract the device id and token id from the access token when autheniticating users | ||||
| | * | | | | Extract the id token of the token when authing users, include the token and ↵ | Mark Haines | 2015-01-28 | 8 | -39/+51 |
| | | | | | | | | | | | | | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events | ||||
| | * | | | | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 8 | -25/+25 |
| | | |/ / | |/| | | |||||
| * | | | | spaces | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Unnecessary newlines. | David Baker | 2015-01-28 | 1 | -5/+0 |
| | | | | | |||||
| * | | | | Unnecessary newline. | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Better style | David Baker | 2015-01-28 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | Another superfluous newline | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Ah, the comma of doom. | David Baker | 2015-01-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Brackets are nicer | David Baker | 2015-01-28 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Unnecessary new line | David Baker | 2015-01-28 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Oops, bad merge: needed to change the base class of the rest servlets too. | David Baker | 2015-01-28 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 14 | -104/+158 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py | ||||
| | * | | | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 2 | -2/+15 |
| | |/ / | | | | | | | | | | | | | | | | 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. | ||||
| | * / | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 2 | -0/+67 |
| | |/ | |||||
| | * | Extract the client v1 base RestServlet to a separate class | Mark Haines | 2015-01-23 | 11 | -72/+44 |
| | | | |||||
| | * | Replace hs.parse_roomalias with RoomAlias.from_string | Mark Haines | 2015-01-23 | 2 | -6/+7 |
| | | | |||||
| | * | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 1 | -2/+2 |
| | | | |||||
| | * | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 4 | -16/+21 |
| | | | |||||
| | * | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 1 | -11/+7 |
| | | | |||||
| * | | Add API to delete push rules. | David Baker | 2015-01-23 | 1 | -1/+40 |
| | | | |||||
| * | | Use push settings! | David Baker | 2015-01-23 | 1 | -14/+29 |
| | | | |||||
| * | | more pep8 | David Baker | 2015-01-23 | 1 | -2/+4 |
| | | | |||||
| * | | Make string format tuple an actual tuple | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | redundant parens | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | stray space | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | make per-device rules work | David Baker | 2015-01-23 | 1 | -5/+15 |
| | | | |||||
| * | | Add slightly pedantic trailing slash error. | David Baker | 2015-01-23 | 1 | -2/+13 |
| | | | |||||
| * | | Fix adding rules without before/after & add the rule that we couldn't find ↵ | David Baker | 2015-01-23 | 1 | -2/+2 |
| | | | | | | | | | to the error | ||||
| * | | This really serves me right for ever making a map called 'map'. | David Baker | 2015-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | As yet fairly untested GET API for push rules | David Baker | 2015-01-22 | 1 | -10/+128 |
| | | | |||||
| * | | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 3 | -1/+278 |
| |/ | | | | | Conflicts: synapse/rest/__init__.py | ||||
| * | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 14 | -0/+1797 |
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |