Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-21 | 5 | -140/+74 |
|\ | |||||
| * | Set a version_string in BaseMediaResource so that the request_handler ↵ | Mark Haines | 2015-04-21 | 1 | -0/+1 |
| | | | | | | | | wrapper works | ||||
| * | Combine the request wrappers in rest/media/v1 and http/server into a single ↵ | Mark Haines | 2015-04-21 | 5 | -140/+73 |
| | | | | | | | | wrapper decorator | ||||
* | | Implement v2 key lookup | Mark Haines | 2015-04-20 | 1 | -1/+3 |
| | | |||||
* | | Return a sha256 fingerprint rather than the entire tls certificate | Mark Haines | 2015-04-14 | 1 | -2/+8 |
| | | |||||
* | | Add a version 2 of the key server api | Mark Haines | 2015-04-14 | 2 | -0/+137 |
|/ | |||||
* | Move server key api into rest/key/v1 | Mark Haines | 2015-04-14 | 3 | -0/+121 |
| | |||||
* | Remove appservice REST servlets | Kegan Dougal | 2015-03-31 | 4 | -190/+0 |
| | |||||
* | Factor out user id validation checks | Erik Johnston | 2015-03-18 | 1 | -9/+5 |
| | |||||
* | Do more validation of incoming request | Erik Johnston | 2015-03-18 | 1 | -3/+3 |
| | |||||
* | Use 403 instead of 400 | Erik Johnston | 2015-03-16 | 1 | -1/+1 |
| | |||||
* | Implement registering with shared secret. | Erik Johnston | 2015-03-13 | 1 | -2/+55 |
| | |||||
* | bump dep on syweb 0.6.5 | Matthew Hodgson | 2015-03-12 | 1 | -2/+3 |
| | |||||
* | Add the master push rule for the break-my-push button. Allow server default ↵ | David Baker | 2015-03-10 | 1 | -1/+4 |
| | | | | rules to be disabled by default. | ||||
* | Merge branch 'develop' into pushrules2 | David Baker | 2015-03-04 | 1 | -29/+6 |
|\ | |||||
| * | Convert expected format for AS regex to include exclusivity. | Kegan Dougal | 2015-02-27 | 1 | -29/+6 |
| | | | | | | | | | | Previously you just specified the regex as a string, now it expects a JSON object with a 'regex' key and an 'exclusive' boolean, as per spec. | ||||
* | | s/user_name/user/ as per mjark's comment | David Baker | 2015-03-02 | 1 | -3/+3 |
| | | |||||
* | | Oops, missed a replacement. | David Baker | 2015-03-02 | 1 | -1/+1 |
| | | |||||
* | | Blank lines | David Baker | 2015-03-02 | 1 | -0/+1 |
| | | |||||
* | | It's set_tweak now, not set_sound | David Baker | 2015-02-27 | 1 | -1/+1 |
| | | |||||
* | | Add API for getting/setting enabled-ness of push rules. | David Baker | 2015-02-26 | 1 | -5/+49 |
|/ | |||||
* | SYWEB-278 Don't allow rules with no rule_id. | David Baker | 2015-02-25 | 1 | -1/+1 |
| | |||||
* | Always allow AS to register | Erik Johnston | 2015-02-20 | 1 | -3/+5 |
| | |||||
* | Disable registration if config option was set. | Erik Johnston | 2015-02-19 | 1 | -0/+4 |
| | |||||
* | SYN-282: Don't log tracebacks for client errors | Mark Haines | 2015-02-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #50 from matrix-org/application-services | Mark Haines | 2015-02-13 | 6 | -14/+282 |
|\ | | | | | Application Services | ||||
| * | Fix newline on __init__ | Kegan Dougal | 2015-02-11 | 1 | -1/+0 |
| | | |||||
| * | PEP8-ify | Kegan Dougal | 2015-02-11 | 1 | -1/+1 |
| | | |||||
| * | Add newline to EOF | Kegan Dougal | 2015-02-11 | 1 | -0/+1 |
| | | |||||
| * | Notify ASes for events sent by other users in a room which an AS user is a ↵ | Kegan Dougal | 2015-02-11 | 1 | -2/+2 |
| | | | | | | | | part of. | ||||
| * | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 5 | -14/+23 |
| |\ | |||||
| * \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-09 | 5 | -28/+36 |
| |\ \ | |||||
| * | | | Grant ASes the ability to delete aliases in their own namespace. | Kegan Dougal | 2015-02-06 | 1 | -2/+29 |
| | | | | |||||
| * | | | Grant ASes the ability to create alias in their own namespace. | Kegan Dougal | 2015-02-06 | 1 | -11/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add a new errcode type M_EXCLUSIVE when users try to create aliases inside AS namespaces, and when ASes try to create aliases outside their own namespace. | ||||
| * | | | Add m.login.application_service registration procedure. | Kegan Dougal | 2015-02-05 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s). | ||||
| * | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 1 | -4/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 1 | -149/+150 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 2 | -20/+20 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add hs_token column and generate a different token f.e application service. | Kegan Dougal | 2015-02-05 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-04 | 2 | -0/+53 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-02 | 16 | -44/+868 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py | ||||
| * | | | | | | | | Add basic application_services SQL, and hook up parts of the appservice ↵ | Kegan Dougal | 2015-01-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store to read from it. | ||||
| * | | | | | | | | Use ApplicationService when registering. | Kegan Dougal | 2015-01-27 | 1 | -2/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Add appservice handler and store. Glue together rest > handler > store. | Kegan Dougal | 2015-01-27 | 2 | -3/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Parse /register and /unregister request JSON. | Kegan Dougal | 2015-01-27 | 1 | -2/+78 |
| | | | | | | | | | |||||
| * | | | | | | | | Add stub application services REST API. | Kegan Dougal | 2015-01-27 | 4 | -0/+127 |
| | | | | | | | | | |||||
* | | | | | | | | | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 10 | -10/+10 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Fix code-style | Mark Haines | 2015-02-10 | 3 | -4/+4 |
| | | | | | | | | |||||
* | | | | | | | | Code-style fixes | Mark Haines | 2015-02-10 | 3 | -10/+19 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Log when we receive a request, when we send a response and how long it took ↵ | Erik Johnston | 2015-02-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to process it. | ||||
* | | | | | | | ...and here's the actual impl. git fail. | Matthew Hodgson | 2015-02-07 | 1 | -25/+32 |
| | | | | | | | |||||
* | | | | | | | thou shalt specify a content-length | Matthew Hodgson | 2015-02-07 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | i hate weakly typed languages | Matthew Hodgson | 2015-02-07 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | priority class now dealt with in namespaced rule_id | David Baker | 2015-02-05 | 1 | -4/+0 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Give server default rules the 'default' attribute and fix various brokenness. | David Baker | 2015-02-05 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Server default rules now of all kinds rather than all being at lowest prio. | David Baker | 2015-02-05 | 1 | -39/+32 |
| | | | | | |||||
* | | | | | namespace rule IDs to be unique within their scope and rule type. | David Baker | 2015-02-05 | 1 | -123/+129 |
| |_|_|/ |/| | | | |||||
* | | | | More s/instance_handle/profile_tag/ | David Baker | 2015-02-04 | 1 | -5/+5 |
| | | | | |||||
* | | | | s/instance_handle/profile_tag/ | David Baker | 2015-02-03 | 2 | -16/+16 |
| |_|/ |/| | | |||||
* | | | Add Cache-Control header to identicon | Mark Haines | 2015-02-02 | 1 | -0/+3 |
| | | | |||||
* | | | Fix setting identicon width and height | Mark Haines | 2015-02-02 | 1 | -2/+2 |
| | | | |||||
* | | | Spell height more correctly | Mark Haines | 2015-02-02 | 1 | -1/+1 |
| | | | |||||
* | | | Add a media/v1/identicon resource for generating identicons using pydenticon | Mark Haines | 2015-02-02 | 2 | -0/+50 |
| |/ |/| | |||||
* | | 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 | 2 | -8/+23 |
| |\ \ \ | |||||
| * \ \ \ | 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 | 14 | -44/+523 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 2 | -8/+23 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge changes from develop | Mark Haines | 2015-01-29 | 14 | -44/+523 |
| |\ \ \ \ \ | |||||
| * | | | | | | 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 | 2 | -8/+23 |
| |_|/ / / |/| | | | | |||||
* | | | | | 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 | 10 | -41/+53 |
|\ \ \ \ | | | | | | | | | | | 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 | 10 | -41/+53 |
| | | | | | | | | | | | | | | | | | | | | 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 | 10 | -27/+27 |
| | |/ / | |/| | | |||||
* | | | | 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 | 28 | -40/+1316 |
|\| | | | | | | | | | Conflicts: synapse/rest/__init__.py | ||||
| * | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 26 | -0/+3059 |
| | | |||||
| * | Move client v1 api rest servlets into a "client/v1" directory | Mark Haines | 2015-01-22 | 13 | -1783/+0 |
| | | |||||
| * | Have /join/:room_id return the room ID in response anyway, for consistency ↵ | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -1/+1 |
| | | | | | | | | of clients (SYN-234) | ||||
* | | Oops: second part of commit dc938606 | David Baker | 2015-01-22 | 1 | -1/+2 |
| | | |||||
* | | Add rest API & store for creating push rules | David Baker | 2015-01-22 | 1 | -0/+195 |
| | | | | | | | | | | Also make unrecognised request error look more like synapse errors because it makes it easier to throw them from within rest classes. | ||||
* | | add instance_handles to pushers so we have a way to refer to them even if ↵ | David Baker | 2015-01-20 | 1 | -1/+2 |
| | | | | | | | | the push token changes. | ||||
* | | Require device language when adding a pusher. | David Baker | 2015-01-16 | 1 | -1/+2 |
| | | | | | | | | | | Because this seems like it might be useful to do sooner rather than later. | ||||
* | | Merge branch 'develop' into pushers | David Baker | 2015-01-13 | 13 | -16/+25 |
|\| | |||||
| * | Add raw query param for scrollback. | Kegan Dougal | 2015-01-08 | 1 | -1/+4 |
| | | |||||
| * | Return the raw federation event rather than adding extra keys for federation ↵ | Kegan Dougal | 2015-01-08 | 2 | -4/+4 |
| | | | | | | | | data. | ||||
| * | Add 'raw' query parameter to expose the event graph and signatures to savvy ↵ | Kegan Dougal | 2015-01-08 | 2 | -2/+8 |
| | | | | | | | | clients. | ||||
| * | Update copyright notices | Mark Haines | 2015-01-06 | 13 | -13/+13 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2014-12-18 | 10 | -112/+111 |
|\| | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py | ||||
| * | clean up coding style a bit | Mark Haines | 2014-12-16 | 2 | -3/+6 |
| | | |||||
| * | Kill off synapse.api.events.* | Erik Johnston | 2014-12-16 | 3 | -8/+5 |
| | | |||||
| * | Rename MessageHandler.handle_event. Add a few comments. | Erik Johnston | 2014-12-15 | 1 | -5/+5 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-15 | 1 | -0/+32 |
| |\ | | | | | | | | | | | | | Conflicts: tests/handlers/test_room.py | ||||
| | * | Initial tiny hack at REST API for setting room typing notification status | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -0/+32 |
| | | | |||||
| * | | Remove unused imports | Erik Johnston | 2014-12-12 | 3 | -3/+0 |
| | | | |||||
| * | | Consistently url decode and decode as utf 8 the URL parts | Erik Johnston | 2014-12-12 | 4 | -42/+24 |
| | | | |||||
| * | | Actually fix bug when uploading state with empty state_key | Erik Johnston | 2014-12-10 | 1 | -2/+2 |
| | | | |||||
| * | | Fix bug when uploading state with empty state_key | Erik Johnston | 2014-12-10 | 1 | -9/+11 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-10 | 1 | -1/+1 |
| |\| | |||||
| | * | track replication destination health, and perform exponential back-off when ↵ | Matthew Hodgson | 2014-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover. | ||||
| * | | Fix registration | Erik Johnston | 2014-12-08 | 1 | -1/+3 |
| | | | |||||
| * | | Convert rest and handlers to use new event structure | Erik Johnston | 2014-12-04 | 2 | -65/+49 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-03 | 1 | -1/+3 |
| |\| | |||||
| * | | Change DomainSpecificString so that it doesn't use a HomeServer object | Erik Johnston | 2014-12-02 | 3 | -5/+5 |
| | | | |||||
* | | | Merge branch 'master' into pushers | David Baker | 2014-12-18 | 1 | -1/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Allow GET /room/:room_id/messages without 'limit' parameter to default to 10 | Paul "LeoNerd" Evans | 2014-12-02 | 1 | -1/+3 |
| |/ | |||||
* | | after a few rethinks, a working implementation of pushers. | David Baker | 2014-12-18 | 1 | -7/+6 |
| | | |||||
* | | Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant. | David Baker | 2014-12-03 | 1 | -12/+20 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2014-12-02 | 1 | -1/+1 |
|\| | |||||
| * | Don't double url-decode state event types. | Kegan Dougal | 2014-11-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 1 | -0/+5 |
|\| | |||||
| * | Fix pep8 and pyflakes warnings | Mark Haines | 2014-11-20 | 1 | -1/+3 |
| | | |||||
| * | Merge branch 'develop' into http_client_refactor | David Baker | 2014-11-20 | 2 | -9/+6 |
| |\ | |||||
| * | | Separate out the matrix http client completely because just about all of its ↵ | David Baker | 2014-11-20 | 1 | -0/+3 |
| | | | | | | | | | | | | code it now separate from the simple case we need for standard HTTP(S) | ||||
* | | | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 2 | -9/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix pep8 codestyle warnings | Mark Haines | 2014-11-20 | 1 | -1/+0 |
| | | | |||||
| * | | Add a few missing yields, Move deferred lists inside PreserveLoggingContext ↵ | Mark Haines | 2014-11-20 | 1 | -8/+6 |
| |/ | | | | | | | because they don't interact well with the logging contexts | ||||
* / | Start creating a module to do generic notifications (just prints them to ↵ | David Baker | 2014-11-19 | 2 | -1/+73 |
|/ | | | | stdout currently!) | ||||
* | Remember also to UTF-8 decode bytes in room alias names in directory server URLs | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -3/+9 |
| | |||||
* | Remember to URL decode the room_id in room initialSync | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -1/+1 |
| | |||||
* | Ensure to parse a real pagination config object out of room initialSync ↵ | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -2/+4 |
| | | | | request and pass it on | ||||
* | Rename message handler's new snapshot_room to room_initial_sync() as that ↵ | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -1/+1 |
| | | | | better suits its purpose | ||||
* | Merge remote-tracking branch 'origin/develop' into room-initial-sync | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -1/+3 |
|\ | |||||
| * | Split out sending the room alias events from creating the alias so that we ↵ | Mark Haines | 2014-11-18 | 1 | -1/+3 |
| | | | | | | | | can do them in the right point when creating a room | ||||
* | | Merge branch 'develop' into room-initial-sync | Paul "LeoNerd" Evans | 2014-11-17 | 3 | -13/+43 |
|\| | | | | | | | | | Conflicts: synapse/handlers/message.py | ||||
| * | Add an EventValidator. Fix bugs in auth ++ storage | Erik Johnston | 2014-11-10 | 2 | -0/+15 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-11-07 | 1 | -3/+3 |
| |\ | | | | | | | | | | federation_authorization | ||||
| * | | Implement new replace_state and changed prev_state | Erik Johnston | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | `prev_state` is now a list of previous state ids, similiar to prev_events. `replace_state` now points to what we think was replaced. | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-10-30 | 5 | -60/+84 |
| |\ \ | | | | | | | | | | | | | federation_authorization | ||||
| * \ \ | Merge branch 'event_signing' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-10-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation_authorization Conflicts: synapse/storage/__init__.py | ||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-10-27 | 2 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federation_authorization Conflicts: synapse/federation/transport.py synapse/handlers/message.py | ||||
| * | | | | | Use state groups to get current state. Make join dance actually work. | Erik Johnston | 2014-10-17 | 2 | -12/+27 |
| | | | | | | |||||
* | | | | | | Have room initialSync return the room's room_id | Paul "LeoNerd" Evans | 2014-11-10 | 1 | -21/+6 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fix url decoding bugs with /redact and /send APIs. | Kegan Dougal | 2014-11-05 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Be sure to urlencode/decode event types correctly in both the web client and HS. | Kegan Dougal | 2014-11-05 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Fix pep8 warnings | Mark Haines | 2014-10-30 | 5 | -60/+84 |
| |_|/ |/| | | |||||
* | | | Fix pyflakes warnings | Mark Haines | 2014-10-27 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Coturn's timestamps are in seconds, not milliseconds | David Baker | 2014-10-21 | 1 | -1/+1 |
| | | |||||
* | | Make sure to return an empty JSON object ({}) from presence PUT/POST ↵ | Paul "LeoNerd" Evans | 2014-10-14 | 1 | -2/+2 |
|/ | | | | requests rather than an empty string ("") because most deserialisers won't like the latter | ||||
* | SYN-2: Allow server admins to delete room aliases | Erik Johnston | 2014-09-30 | 1 | -1/+19 |
| | |||||
* | SYN-48: Fix typo. Get the whois for requested user rather tahan the requester | Erik Johnston | 2014-09-29 | 1 | -1/+1 |
| | |||||
* | SYN-48: Implement WHOIS rest servlet | Erik Johnston | 2014-09-29 | 2 | -1/+50 |
| | |||||
* | Track the IP users connect with. Add an admin column to users table. | Erik Johnston | 2014-09-26 | 1 | -7/+1 |
| | |||||
* | Merge branch 'deletions' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-25 | 1 | -1/+37 |
|\ | |||||
| * | Rename deletions to redactions | Erik Johnston | 2014-09-24 | 1 | -6/+6 |
| | | |||||
| * | Add m.room.deletion. If an event is deleted it will be returned to clients ↵ | Erik Johnston | 2014-09-23 | 1 | -1/+37 |
| | | | | | | | | 'pruned', i.e. all client specified keys will be removed. | ||||
* | | Merge branch 'turn' into develop | David Baker | 2014-09-25 | 2 | -1/+62 |
|\ \ | |||||
| * | | Make turn server endpoint return an empty object if no turn servers to | David Baker | 2014-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | match the normal response. Don't break if the turn_uris option isn't present. | ||||
| * | | The REST API spec only alows for returning a single server so name the | David Baker | 2014-09-24 | 1 | -1/+1 |
| | | | | | | | | | | | | endpoint appropriately. | ||||
| * | | Oops | David Baker | 2014-09-24 | 1 | -1/+1 |
| | | | |||||
| * | | rename endpoint to better reflect what it is and allow specifying multiple uris | David Baker | 2014-09-24 | 1 | -5/+3 |
| | | | |||||
| * | | Use standard base64 encoding with padding to get the same result as | David Baker | 2014-09-24 | 1 | -2/+5 |
| | | | | | | | | | | | | coturn. | ||||
| * | | The config is not hierarchical | David Baker | 2014-09-23 | 1 | -3/+3 |
| | | | |||||
| * | | Add support for TURN servers as per the TURN REST API ↵ | David Baker | 2014-09-23 | 2 | -1/+61 |
| |/ | | | | | | | (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00) | ||||
* | | Bugfix for older Pythons that lack hmac.compare_digest() | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -1/+11 |
| | | |||||
* | | Merge branch 'jira/SYN-60' into develop | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -5/+38 |
|\ \ | |||||
| * | | Send an HMAC(SHA1) protecting the User ID for the ReCAPTCHA bypass, rather ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -7/+26 |
| | | | | | | | | | | | | than simply the secret itself, so it's useless if that HMAC leaks | ||||
| * | | Config values are almost never 'None', but they might be empty string. ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Detect their presence by truth | ||||
| * | | Make sure the config actually /has/ a captcha_bypass_secret set before ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -2/+3 |
| | | | | | | | | | | | | trying to compare it | ||||
| * | | Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -5/+18 |
| |/ | | | | | | | secret to allow bots to bypass the ReCAPTCHA test (SYN-60) | ||||
* / | Implemented /rooms/$roomid/state API. | Kegan Dougal | 2014-09-23 | 1 | -6/+7 |
|/ | |||||
* | Comment out password reset for now, until the mechanism is fully discussed ↵ | Kegan Dougal | 2014-09-16 | 1 | -1/+1 |
| | | | | (IS token auth vs HS auth) | ||||
* | Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need ↵ | Kegan Dougal | 2014-09-16 | 1 | -0/+22 |
| | | | | to send email. | ||||
* | More helpful 400 error messages. | Kegan Dougal | 2014-09-15 | 1 | -1/+5 |
| | |||||
* | Be consistent when associating keys with login types for registration/login. | Kegan Dougal | 2014-09-15 | 1 | -1/+1 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-09-15 | 2 | -2/+2 |
|\ | | | | | | | registration-api-changes in preparation for re-merge to develop. | ||||
| * | Correctly handle the 'age' key in events and pdus | Erik Johnston | 2014-09-15 | 2 | -2/+2 |
| | | |||||
* | | Make captcha work again with the new registration logic. | Kegan Dougal | 2014-09-15 | 1 | -0/+1 |
| | | |||||
* | | Split out password/captcha/email logic. | Kegan Dougal | 2014-09-15 | 1 | -84/+153 |
| | | |||||
* | | Added LoginType constants. Created general structure for processing ↵ | Kegan Dougal | 2014-09-15 | 1 | -20/+75 |
|/ | | | | registrations. | ||||
* | Added captcha support on both the HS and web client. | Kegan Dougal | 2014-09-05 | 1 | -2/+34 |
|\ | | | | | | | Merge branch 'captcha' of github.com:matrix-org/synapse into develop | ||||
| * | 80 chars please | Kegan Dougal | 2014-09-05 | 1 | -2/+4 |
| | | |||||
| * | Add config opion for XFF headers when performing ReCaptcha auth. | Kegan Dougal | 2014-09-05 | 1 | -2/+5 |
| | | |||||
| * | Captchas now work on registration. Missing x-forwarded-for config arg ↵ | Kegan Dougal | 2014-09-05 | 1 | -3/+26 |
| | | | | | | | | support. Missing reloading a new captcha on the web client / displaying a sensible error message. | ||||
| * | Added a captcha config to the HS, to enable registration captcha checking ↵ | Kegan Dougal | 2014-09-05 | 1 | -1/+5 |
| | | | | | | | | and for the recaptcha private key. | ||||
* | | Generate m.room.aliases event when the HS creates a room alias | Erik Johnston | 2014-09-05 | 1 | -1/+4 |
|/ | |||||
* | Empty string is not a valid JSON object, so don't return them in HTTP responses. | Erik Johnston | 2014-09-05 | 3 | -7/+7 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2014-09-03 | 11 | -29/+67 |
|\ | | | | | | | | | Conflicts: synapse/http/client.py | ||||
| * | Implement a kick api | Erik Johnston | 2014-09-03 | 1 | -2/+5 |
| | | |||||
| * | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 11 | -11/+11 |
| | | | | | | | | hasn't been incorporated in time for launch. | ||||
| * | Bubble up SynapseErrors so expected failures aren't masked. | Kegan Dougal | 2014-09-03 | 1 | -0/+2 |
| | | |||||
| * | Add exception handling to directory servlet, so we don't 500. Mark directory ↵ | Kegan Dougal | 2014-09-03 | 1 | -2/+16 |
| | | | | | | | | API as volatile in the api docs. | ||||
| * | Fix up directory server to not require uploading room hosts. Update the room ↵ | Erik Johnston | 2014-09-03 | 1 | -1/+1 |
| | | | | | | | | hosts table with the current room hosts (if we have them) on GET. | ||||
| * | Kill the state | Paul "LeoNerd" Evans | 2014-09-03 | 1 | -5/+1 |
| | | | | | | | | ... key from all the Presence messages | ||||
| * | apidocs: mtime_age > last_active_ago. Presence REST: Sanity check values in ↵ | Kegan Dougal | 2014-09-03 | 1 | -0/+8 |
| | | | | | | | | invite/drop arrays. | ||||
| * | Edited /presence REST servlet to raise SynapseErrors to return a standard ↵ | Kegan Dougal | 2014-09-03 | 1 | -7/+12 |
| | | | | | | | | error response, rather than a string. | ||||
| * | Fixed /presence APIs to urldecode user IDs. | Kegan Dougal | 2014-09-03 | 1 | -1/+5 |
| | | |||||
| * | URL decode user IDs for /profile REST path segments. | Kegan Dougal | 2014-09-03 | 1 | -0/+6 |
| | | |||||
* | | Add support for registering with a threepid to the HS (get credentials from ↵ | David Baker | 2014-09-03 | 1 | -1/+6 |
|/ | | | | the client and check them against an ID server). | ||||
* | Add ban support: /rooms/$roomid/ban with { user_id : foo } | Kegan Dougal | 2014-09-03 | 1 | -2/+2 |
| | |||||
* | Order matters when adding REST servlets | Paul "LeoNerd" Evans | 2014-09-02 | 1 | -21/+21 |
| | |||||
* | Add rest endpoint for the whole user profile | David Baker | 2014-09-02 | 1 | -0/+21 |
| | |||||
* | Rename 'state' presence key to the much more obvious 'presence'; maintain a ↵ | Paul "LeoNerd" Evans | 2014-09-01 | 1 | -1/+5 |
| | | | | legacy 'state' copy for now | ||||
* | Support multiple login flows when deciding how to login. Updated cmdclient ↵ | Kegan Dougal | 2014-08-28 | 1 | -1/+1 |
| | | | | and spec. Webclient doesn't need updating for this. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-08-27 | 1 | -0/+46 |
|\ | |||||
| * | Added RestServlet for /rooms/$roomid/initialSync | Kegan Dougal | 2014-08-27 | 1 | -0/+30 |
| | | |||||
| * | Added RestServlet for /rooms/$roomid/state | Kegan Dougal | 2014-08-27 | 1 | -0/+16 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-27 | 4 | -37/+14 |
|\| |