Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 1 | -1/+9 |
| | |||||
* | Remove accidentally committed debug logging | Mark Haines | 2015-12-21 | 1 | -1/+0 |
| | |||||
* | Fix spacing | Mark Haines | 2015-12-14 | 1 | -1/+1 |
| | |||||
* | Fix logging to lie less | Mark Haines | 2015-12-14 | 1 | -2/+9 |
| | |||||
* | Add commentary for fix in PR#442 | Mark Haines | 2015-12-14 | 1 | -0/+6 |
| | |||||
* | Combine the prev content tests | Mark Haines | 2015-12-14 | 1 | -14/+12 |
| | |||||
* | Check whether prev_content or prev_sender is set before trying to rollback state | Mark Haines | 2015-12-14 | 1 | -8/+13 |
| | |||||
* | Allow filter JSON object in the filter query parameter in /sync | Mark Haines | 2015-12-09 | 1 | -9/+21 |
| | | | | Documented by matrix-org/matrix-doc#224 | ||||
* | Actually host r0 and unstable prefixes | Daniel Wagner-Hall | 2015-12-08 | 1 | -36/+0 |
| | |||||
* | Update endpoints to reflect current spec | Daniel Wagner-Hall | 2015-12-02 | 2 | -3/+3 |
| | |||||
* | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 3 | -0/+119 |
| | |||||
* | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 10 | -27/+35 |
| | |||||
* | Merge branch 'develop' into rav/flatten_sync_response | Paul "LeoNerd" Evans | 2015-11-19 | 2 | -5/+5 |
|\ | |||||
| * | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 2 | -5/+5 |
| | | |||||
* | | Put back the 'state.events' subobject | Richard van der Hoff | 2015-11-19 | 1 | -1/+1 |
| | | | | | | | | We're keeping 'events', in case we decide to add more keys later. | ||||
* | | v2 /sync: Rename the keys of the 'rooms' object to match member states | Richard van der Hoff | 2015-11-19 | 1 | -3/+3 |
| | | | | | | | | | | | | joined->join invited->invite archived->leave | ||||
* | | Flatten the /sync response to remove the event_map | Richard van der Hoff | 2015-11-19 | 1 | -22/+13 |
|/ | |||||
* | Implementation of state rollback in /sync | Richard van der Hoff | 2015-11-13 | 1 | -2/+65 |
| | | | | | | | Implementation of SPEC-254: roll back the state dictionary to how it looked at the start of the timeline. Merged PR https://github.com/matrix-org/synapse/pull/373 | ||||
* | Make handlers.sync return a state dictionary, instead of an event list. | Richard van der Hoff | 2015-11-13 | 1 | -1/+1 |
| | | | | | | | | | Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371 | ||||
* | Update some comments | Richard van der Hoff | 2015-11-13 | 1 | -0/+56 |
| | | | | | | | Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370. | ||||
* | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 7 | -14/+39 |
| | | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices. | ||||
* | That TODO was done | Mark Haines | 2015-11-03 | 1 | -1/+0 |
| | |||||
* | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 1 | -0/+5 |
| | |||||
* | Store room tag content and return the content in the m.tag event | Mark Haines | 2015-11-02 | 1 | -2/+10 |
| | |||||
* | Merge branch 'develop' into markjh/room_tags | Mark Haines | 2015-11-02 | 1 | -2/+4 |
|\ | |||||
| * | Implement full_state incremental sync | Richard van der Hoff | 2015-10-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | A hopefully-complete implementation of the full_state incremental sync, as specced at https://github.com/matrix-org/matrix-doc/pull/133. This actually turns out to be a relatively simple modification to the initial sync implementation. | ||||
* | | Inform the client of new room tags using v1 /events | Mark Haines | 2015-10-29 | 1 | -3/+11 |
| | | |||||
* | | Fix pyflakes errors | Mark Haines | 2015-10-28 | 1 | -0/+2 |
| | | |||||
* | | Add APIs for adding and removing tags from rooms | Mark Haines | 2015-10-28 | 2 | -0/+91 |
|/ | |||||
* | Merge pull request #319 from matrix-org/erikj/filter_refactor | Erik Johnston | 2015-10-22 | 1 | -2/+2 |
|\ | | | | | Refactor api.filtering to have a Filter API | ||||
| * | Refactor api.filtering to have a Filter API | Erik Johnston | 2015-10-20 | 1 | -2/+2 |
| | | |||||
* | | Add rooms that the user has left under archived in v2 sync. | Mark Haines | 2015-10-19 | 1 | -6/+23 |
|/ | |||||
* | Include invites in incremental sync | Mark Haines | 2015-10-13 | 1 | -1/+1 |
| | |||||
* | Include invited rooms in the initial sync | Mark Haines | 2015-10-13 | 1 | -1/+20 |
| | |||||
* | Start spliting out the rooms into joined and invited in v2 sync | Mark Haines | 2015-10-13 | 1 | -9/+9 |
| | |||||
* | Update the filters to match the latest spec. | Mark Haines | 2015-10-12 | 1 | -15/+11 |
| | | | | | Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response. | ||||
* | Set the user as online if they start polling the v2 sync | Mark Haines | 2015-10-09 | 1 | -3/+11 |
| | |||||
* | Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api | Mark Haines | 2015-10-09 | 1 | -0/+4 |
|\ | |||||
| * | Validate the receipt type before passing it on to the receipt handler | Kegan Dougal | 2015-10-01 | 1 | -0/+4 |
| | | |||||
* | | Format the presence events correctly for v2 | Mark Haines | 2015-10-09 | 1 | -3/+9 |
| | | |||||
* | | Update the v2 room sync format to match the current v2 spec | Mark Haines | 2015-10-08 | 1 | -7/+7 |
| | | |||||
* | | Update the sync response to match the latest spec | Mark Haines | 2015-10-07 | 1 | -24/+22 |
| | | |||||
* | | Move the rooms out into a room_map mapping from room_id to room. | Mark Haines | 2015-10-05 | 1 | -13/+31 |
| | | |||||
* | | Start updating the sync API to match the specification | Mark Haines | 2015-10-01 | 1 | -53/+22 |
|/ | |||||
* | Merge pull request #274 from matrix-org/add_threepid_fix | David Baker | 2015-09-10 | 1 | -0/+1 |
|\ | | | | | Fix adding threepids to an existing account | ||||
| * | Fix adding threepids to an existing account | David Baker | 2015-09-10 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #248 from matrix-org/deviceid | Daniel Wagner-Hall | 2015-08-25 | 5 | -11/+10 |
|\ \ | | | | | | | Remove completely unused concepts from codebase | ||||
| * | | Fix up one more reference | Daniel Wagner-Hall | 2015-08-25 | 1 | -3/+2 |
| | | | |||||
| * | | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 5 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly. | ||||
* | | | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 1 | -1/+2 |
|/ / | |||||
* | | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 2 | -1/+29 |
|\| | | | | | | | | | Conflicts: synapse/rest/client/v1/login.py | ||||
| * | Remove spurious extra arg to set_password | David Baker | 2015-08-20 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #211 from matrix-org/email_in_use | Mark Haines | 2015-08-20 | 1 | -0/+28 |
| |\ | | | | | | | Changes for unique emails | ||||
| | * | Check absent before trying to access keys | David Baker | 2015-08-12 | 1 | -3/+3 |
| | | | |||||
| | * | Just leaving off the $ is fine. r* == registerrrrrrrrr | David Baker | 2015-08-12 | 1 | -1/+1 |
| | | | |||||
| | * | Remember to yield: not much point testing is a deferred is not None | David Baker | 2015-08-04 | 1 | -1/+2 |
| | | | |||||
| | * | splt long line | David Baker | 2015-08-04 | 1 | -1/+3 |
| | | | |||||
| | * | Add endpoint that proxies ID server request token and errors if the given ↵ | David Baker | 2015-08-04 | 1 | -1/+26 |
| | | | | | | | | | | | | email is in use on this Home Server. | ||||
* | | | /tokenrefresh POST endpoint | Daniel Wagner-Hall | 2015-08-20 | 2 | -0/+58 |
|/ / | | | | | | | | | | | | | | | This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them. | ||||
* | | Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation | Mark Haines | 2015-08-18 | 1 | -30/+70 |
|\ \ | | | | | | | Federation for end-to-end key requests. | ||||
| * | | Merge remote-tracking branch 'origin/develop' into ↵ | Mark Haines | 2015-08-13 | 1 | -54/+73 |
| |\| | | | | | | | | | | markjh/end-to-end-key-federation | ||||
| * | | Get the end-to-end key federation working | Mark Haines | 2015-07-24 | 1 | -5/+5 |
| | | | |||||
| * | | Add federation support for end-to-end key requests | Mark Haines | 2015-07-23 | 1 | -30/+70 |
| | | | |||||
* | | | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 2 | -7/+4 |
| |/ |/| | | | | | | | | | | | | | | | * Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly | ||||
* | | Don't try & check the username if we don't have one (which we won't if it's ↵ | David Baker | 2015-08-03 | 1 | -1/+2 |
| | | | | | | | | been saved in the auth layer) | ||||
* | | Use the same reg paths as register v1 for ASes. | Kegan Dougal | 2015-07-29 | 1 | -4/+6 |
| | | | | | | | | Namely this means using registration_handler.appservice_register. | ||||
* | | Fix v2_alpha registration. Add unit tests. | Kegan Dougal | 2015-07-28 | 1 | -54/+70 |
|/ | | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag. | ||||
* | Query for all the ones we were asked about, not just the last... | David Baker | 2015-07-21 | 1 | -1/+1 |
| | |||||
* | s/take/claim/ for end to end key APIs | Mark Haines | 2015-07-20 | 1 | -5/+5 |
| | |||||
* | Merge pull request #199 from matrix-org/erikj/receipts | Erik Johnston | 2015-07-16 | 2 | -0/+57 |
|\ | | | | | Implement read receipts. | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-13 | 2 | -0/+278 |
| |\ | |||||
| * | | 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 |
| | | | |||||
* | | | pep8 + debug line | David Baker | 2015-07-15 | 1 | -6/+8 |
| | | | |||||
* | | | Add back in support for remembering parameters submitted to a ↵ | David Baker | 2015-07-15 | 1 | -2/+9 |
| |/ |/| | | | | | user-interactive auth call. | ||||
* | | 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 |
|/ | |||||
* | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 1 | -1/+1 |
| | | | | ujson.loads | ||||
* | Make shared secret registration work again | David Baker | 2015-05-14 | 1 | -1/+4 |
| | |||||
* | user_id now in user_threepids | David Baker | 2015-05-01 | 1 | -3/+3 |
| | |||||
* | 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 | 1 | -9/+11 |
|\ | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| * | Combine the request wrappers in rest/media/v1 and http/server into a single ↵ | Mark Haines | 2015-04-21 | 1 | -9/+11 |
| | | | | | | | | wrapper decorator | ||||
* | | 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 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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. | ||||
* | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 1 | -1/+1 |
| | |||||
* | Fix code-style | Mark Haines | 2015-02-10 | 1 | -1/+1 |
| | |||||
* | Log when we receive a request, when we send a response and how long it took ↵ | Erik Johnston | 2015-02-09 | 1 | -1/+1 |
| | | | | to process it. | ||||
* | 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 |
|\ | |||||
| * | 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 | ||||
* | | 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 | -2/+2 |
|\| | |||||
| * | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 2 | -1/+106 |
|\| | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py | ||||
| * | 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 | ||||
| * | 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 | ||||
| * | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 2 | -0/+67 |
| | |||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | Start implementing the v2_alpha sync API | Mark Haines | 2015-01-23 | 3 | -0/+214 |