Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-13 | 3 | -1/+352 |
|\ | |||||
| * | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management | Erik Johnston | 2015-07-10 | 2 | -1/+279 |
| |\ | | | | | | | Client end to end key management API | ||||
| | * | Assume that each device for a user has only one of each type of key | Mark Haines | 2015-07-10 | 1 | -3/+3 |
| | | | |||||
| | * | Don't bother with a timeout for one time keys on the server. | Mark Haines | 2015-07-09 | 1 | -18/+7 |
| | | | |||||
| | * | Add client API for uploading and querying keys for end to end encryption | Mark Haines | 2015-07-06 | 2 | -1/+290 |
| | | | |||||
| * | | Small tweaks to SAML2 configuration. | Erik Johnston | 2015-07-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled. | ||||
| * | | Merge pull request #201 from EricssonResearch/msba/saml2-develop | Erik Johnston | 2015-07-10 | 1 | -1/+74 |
| |\ \ | | |/ | |/| | Integrate SAML2 basic authentication - uses pysaml2 | ||||
| | * | Make SAML2 optional and add some references/comments | Muthu Subramanian | 2015-07-09 | 1 | -4/+9 |
| | | | |||||
| | * | code beautify | Muthu Subramanian | 2015-07-09 | 1 | -9/+4 |
| | | | |||||
| | * | code beautify | Muthu Subramanian | 2015-07-08 | 1 | -10/+23 |
| | | | |||||
| | * | Integrate SAML2 basic authentication - uses pysaml2 | Muthu Subramanian | 2015-07-08 | 1 | -1/+61 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-08 | 4 | -15/+48 |
|\| | | |||||
| * | | If user supplies filename in URL when downloading from media repo, use that ↵ | Erik Johnston | 2015-07-03 | 3 | -9/+14 |
| | | | | | | | | | | | | name in Content Disposition | ||||
| * | | Enforce ascii filenames for uploads | Erik Johnston | 2015-06-30 | 2 | -1/+6 |
| | | | |||||
| * | | Add Content-Disposition headers to media repo v1 downloads | Erik Johnston | 2015-06-30 | 3 | -7/+30 |
| |/ | |||||
* | | Wire together receipts and the notifer/federation | Erik Johnston | 2015-07-07 | 1 | -2/+1 |
| | | |||||
* | | Add a ReceiptServlet | Erik Johnston | 2015-07-07 | 2 | -1/+59 |
|/ | |||||
* | Remove access_token from synapse.rest.client.v1.transactions ↵ | Erik Johnston | 2015-06-16 | 1 | -3/+3 |
| | | | | {get,store}_response logging | ||||
* | Merge pull request #175 from matrix-org/erikj/thumbnail_thread | Erik Johnston | 2015-06-03 | 1 | -45/+53 |
|\ | | | | | Thumbnail images on a seperate thread | ||||
| * | Thumbnail images on a seperate thread | Erik Johnston | 2015-06-02 | 1 | -45/+53 |
| | | |||||
* | | SYN-403: Make content repository use its own http client. | Erik Johnston | 2015-06-03 | 1 | -1/+2 |
|/ | |||||
* | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 2 | -2/+2 |
| | | | | ujson.loads | ||||
* | Merge pull request #165 from matrix-org/bugs/SYN-390 | Erik Johnston | 2015-05-26 | 1 | -5/+8 |
|\ | | | | | SYN-390: Don't modify the dictionary returned from the data store | ||||
| * | SYN-390: Don't modify the dictionary returned from the data store | Mark Haines | 2015-05-26 | 1 | -5/+8 |
| | | |||||
* | | Make shared secret registration work again | David Baker | 2015-05-14 | 1 | -1/+4 |
| | | |||||
* | | Change the way we create observers to deferreds so that we don't get spammed ↵ | Erik Johnston | 2015-05-08 | 1 | -2/+6 |
|/ | | | | by 'unhandled errors' | ||||
* | user_id now in user_threepids | David Baker | 2015-05-01 | 1 | -3/+3 |
| | |||||
* | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-29 | 7 | -4/+576 |
|\ | | | | | | | | | Conflicts: synapse/config/homeserver.py | ||||
| * | Merge pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 7 | -4/+576 |
| |\ | | | | | | | Client / Server Auth Refactor | ||||
| | * | pep8 | David Baker | 2015-04-27 | 1 | -1/+2 |
| | | | |||||
| | * | logging args | David Baker | 2015-04-27 | 1 | -2/+2 |
| | | | |||||
| | * | More underscores | David Baker | 2015-04-24 | 2 | -4/+4 |
| | | | |||||
| | * | Use underscores instead of camelcase for id server stuff | David Baker | 2015-04-24 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch 'develop' into csauth | David Baker | 2015-04-24 | 5 | -140/+74 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| | * | | Dedicated error code for failed 3pid auth verification | David Baker | 2015-04-23 | 1 | -1/+3 |
| | | | | |||||
| | * | | Password reset, finally. | David Baker | 2015-04-17 | 1 | -5/+16 |
| | | | | |||||
| | * | | Add endpoint to get threepids from server | David Baker | 2015-04-17 | 1 | -0/+12 |
| | | | | |||||
| | * | | make add3pid servlet work | David Baker | 2015-04-17 | 2 | -12/+64 |
| | | | | |||||
| | * | | just the once would probably be fine | David Baker | 2015-04-17 | 1 | -1/+0 |
| | | | | |||||
| | * | | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 5 | -162/+93 |
| | |\ \ | |||||
| | * | | | Register the 3pid servlet | David Baker | 2015-04-17 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | password -> account servlet and add start of an 'add 3pid' endpoint | David Baker | 2015-04-17 | 2 | -2/+17 |
| | | | | | |||||
| | * | | | Return user ID in use error straight away | David Baker | 2015-04-16 | 1 | -2/+23 |
| | | | | | |||||
| | * | | | Dummy login so we can do the first POST request to get login flows without ↵ | David Baker | 2015-04-15 | 1 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | it just succeeding | ||||
| | * | | | Regstration with email in v2 | David Baker | 2015-04-15 | 2 | -7/+7 |
| | | | | | |||||
| | * | | | Add app service auth back in to v2 register | David Baker | 2015-04-02 | 1 | -2/+7 |
| | | | | | |||||
| | * | | | Throw sensible errors on not-json when allowing empty body | David Baker | 2015-04-02 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | pep8 | David Baker | 2015-04-02 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Add shared secret auth into register v2 and switch the script over. | David Baker | 2015-04-02 | 1 | -11/+58 |
| | | | | | |||||
| | * | | | Completely replace fallback auth for C/S V2: | David Baker | 2015-04-01 | 3 | -2/+193 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Now only the auth part goes to fallback, not the whole operation * Auth fallback is a normal API endpoint, not a static page * Params like the recaptcha pubkey can just live in the config Involves a little engineering on JsonResource so its servlets aren't always forced to return JSON. I should document this more, in fact I'll do that now. | ||||
| | * | | | pep8 | David Baker | 2015-03-31 | 2 | -3/+4 |
| | | | | | |||||
| | * | | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 3 | -1/+95 |
| | | | | | |||||
| | * | | | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ↵ | David Baker | 2015-03-25 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | flag in the API. | ||||
| | * | | | 1) Pushers are now associated with an access token | David Baker | 2015-03-24 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | 2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it. | ||||
| | * | | | Make deleting other access tokens when you change your password actually work | David Baker | 2015-03-24 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | pep8 / pyflakes | David Baker | 2015-03-23 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Implement password changing (finally) along with a start on making ↵ | David Baker | 2015-03-23 | 3 | -1/+91 |
| | | | | | | | | | | | | | | | | | | | | client/server auth more general. | ||||
* | | | | | Implement minimum_valid_until_ts in the remote key resource | Mark Haines | 2015-04-29 | 1 | -4/+55 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-27 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/crypto/keyring.py | ||||
| * | | | | Implement locks using create_observer for fetching media and server keys | Erik Johnston | 2015-04-27 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Copyright notice | Mark Haines | 2015-04-24 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 1 | -0/+14 |
|\| | | | | |||||
| * | | | | Copyright notices | Mark Haines | 2015-04-24 | 1 | -0/+14 |
| | |_|/ | |/| | | |||||
* | | | | Update to match the specification for key/v2 | Mark Haines | 2015-04-23 | 2 | -19/+24 |
| | | | | |||||
* | | | | Implement remote key lookup api | Mark Haines | 2015-04-22 | 3 | -8/+185 |
| | | | | |||||
* | | | | 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 |
| |_|_|_|/ |/| | | | |