summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Port receipt and read markers to async/waitErik Johnston2019-10-292-15/+9
| | |/ /
* | | | Merge pull request #6275 from matrix-org/erikj/port_rest_eventsAndrew Morgan2020-03-161-94/+72
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '72bc6294e': Newsfile Port room rest handlers to async/await
| * | | Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
| |/ /
* | | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingAndrew Morgan2020-03-162-9/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44ab048cf': Address codestyle concerns Reduce impact of debug logging Delay printf until logging is required. use %r to __repr__ objects Don't encode object as UTF-8 string if not needed.
| * | Address codestyle concernsMichael Kaye2019-10-242-2/+9
| | |
| * | Delay printf until logging is required.Michael Kaye2019-10-242-9/+9
| |/ | | | | | | | | Using % will cause the string to be generated even if debugging is off.
* | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Andrew Morgan2020-03-161-1/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '276173163': Add changelog entry fix doc strings make isort happy add some comments drop some logger lines to debug make changes based on PR feedback add function docs use something that's the right type for user_id run black split out signature processing into separate functions avoid modifying input parameter fix test update with newer coding style add test make isort happy make black happy allow uploading signatures of master key signed by devices implement device signature uploading/fetching
| * Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1817-346/+585
| |\
| * \ Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-075-168/+346
| |\ \
| * | | update with newer coding styleHubert Chathi2019-09-041-2/+2
| | | |
| * | | make black happyHubert Chathi2019-09-041-0/+1
| | | |
| * | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+1
| | | |
| * | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+50
| | | |
* | | | Remove Auth.check method (#6217)Andrew Morgan2020-03-161-3/+43
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93eaeec75': Remove Auth.check method (#6217) add note about database upgrade use the right function for when we're already in runInteraction add user signature stream change cache to slaved device store black use stream ID generator instead of timestamp make isort happy apply PR review suggestions fix formatting add changelog make changes from PR review don't need to return the hidden column any more really fix queries to work with Postgres PostgreSQL, Y U no like? remove extra SQL query param add changelog file apply changes from PR review allow uploading keys for cross-signing allow devices to be marked as "hidden"
| * | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1817-346/+585
| |\ \ \
| * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-075-168/+346
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0439-193/+195
| |\ \ \
| * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2813-173/+367
| |\ \ \ \
| * | | | | apply PR review suggestionsHubert Chathi2019-08-211-1/+1
| | | | | |
| * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0139-297/+309
| |\ \ \ \ \
| * | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-251-3/+43
| | | | | | |
* | | | | | | Merge branch 'master' into developAndrew Morgan2020-02-265-114/+84
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #6196 from matrix-org/erikj/awaitErik Johnston2019-10-185-114/+84
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Move rest/admin to use async/await.
| | * | | | | | Port synapse/rest/client/_base.py to async/awaitErik Johnston2019-10-111-9/+5
| | | | | | | |
| | * | | | | | Add maybe_awaitable and fix __init__ bugsErik Johnston2019-10-111-2/+5
| | | | | | | |
| | * | | | | | Port synaps/rest/client/users.py to async/awaitErik Johnston2019-10-111-11/+7
| | | | | | | |
| | * | | | | | Port synaps/rest/client/server_notice_servlet.py to async/awaitErik Johnston2019-10-111-6/+3
| | | | | | | |
| | * | | | | | Port synaps/rest/client/media.py to async/awaitErik Johnston2019-10-111-16/+11
| | | | | | | |
| | * | | | | | Port rest/admin/__init__.py to async/awaitErik Johnston2019-10-111-72/+55
| | | | | | | |
* | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionAndrew Morgan2020-02-261-1/+1
|\| | | | | | |
| * | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | make version optional in body of e2e backup version update
| | * | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to agree with latest version of the MSC
* | | | | | | | | cas: support setting display name (#6114)Andrew Morgan2020-02-261-1/+3
|\| | | | | | | |
| * | | | | | | | cas: support setting display name (#6114)Valérian Rousset2019-10-111-1/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly.
* | | | | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytesAndrew Morgan2020-02-261-2/+2
|\| | | | | | |
| * | | | | | | Fix store_url_cache using bytesErik Johnston2019-10-101-2/+2
| | | | | | | |
* | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)Andrew Morgan2020-02-262-22/+31
|\| | | | | | |
| * | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-102-22/+31
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed the weirdness of 400 vs 404 as http status code in the case the filter id is not known by the server. As e.g. matrix-js-sdk expects 404 to catch this situation this leads to unwanted behaviour.
* | | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Andrew Morgan2020-02-261-2/+6
|\| | | | | |
| * | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Anshul Angaria2019-10-081-2/+6
| | | | | | | | | | | | | | | | | | | | | Fixes #6109
* | | | | | | Log responder we are using. (#6139)Andrew Morgan2020-02-261-1/+1
|\| | | | | |
| * | | | | | Log responder we are using. (#6139)Michael Kaye2019-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | This prevents us logging "Responding to media request with responder %s".
* | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Andrew Morgan2020-02-261-3/+11
|\| | | | | |
| * | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Robert Swain2019-10-041-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pillow will use nearest neighbour as the resampling algorithm if the source image is either 1-bit or a color palette using 8 bits. If we convert to RGB before scaling, we'll probably get a better result.
* | | | | | | Land improved room list based on room stats (#6019)Andrew Morgan2020-02-261-0/+8
|\| | | | | |
| * | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use room_stats and room_state for room directory search
* | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-261-2/+2
|\| | | | | |
* | | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanAndrew Morgan2020-02-251-0/+18
|\| | | | | |
| * | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanErik Johnston2019-09-271-0/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add some helpful opentracing tags and remove get_user_by_req span
| | * | | | | | isortErik Johnston2019-09-251-1/+1
| | | | | | | |
| | * | | | | | Add tags for event_id and txn_id in event sendingErik Johnston2019-09-251-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to search for sending event requests.
* | | | | | | | Kill off half-implemented password-reset via sms (#6101)Andrew Morgan2020-02-251-66/+1
|\| | | | | | |
| * | | | | | | Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-261-64/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing a password reset via SMS has never worked, and in any case is a silly idea because msisdn recycling is a thing. See also matrix-org/matrix-doc#2303.
* | | | | | | | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-251-3/+29
|\| | | | | | |
| * | | | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100.
* | | | | | | | Refactor code for calculating registration flows (#6106)Andrew Morgan2020-02-251-62/+62
|\| | | | | | |
| * | | | | | | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-251-62/+62
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because, frankly, it looked like it was written by an axe-murderer. This should be a non-functional change, except that where `m.login.dummy` was previously advertised *before* `m.login.terms`, it will now be advertised afterwards. AFAICT that should have no effect, and will be more consistent with the flows that involve passing a 3pid.
* | | | | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-251-0/+14
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-243-75/+316
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1944-425/+732
| |\ \ \ \ \ \ \
| * | | | | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table.
* | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2020-02-251-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2019-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a m.separate_add_and_bind flag set to True. See MSC2290's Backward Compatibility section for details.
* | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2020-02-251-0/+3
|\| | | | | | | |
| * | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2019-09-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a flag to /versions' unstable_features section indicating that this Synapse understands what an id_access_token is, as per MSC2264. Fixes #5927
* | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2020-02-251-1/+13
|\| | | | | | | |
| * | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2019-09-231-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As MSC2263 states, m.require_identity_server must be set to false when it does not require an identity server to be provided by the client for the purposes of email registration or password reset. Adds an m.require_identity_server flag to /versionss unstable_flags section. This will advertise that Synapse no longer needs id_server as a parameter.
* | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2020-02-251-2/+45
|\| | | | | | | |
| * | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-231-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | First part of solving #6076
* | | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-252-70/+127
|\| | | | | | | |
| * | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-232-72/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements MSC2290. This PR adds two new endpoints, /unstable/account/3pid/add and /unstable/account/3pid/bind. Depending on the progress of that MSC the unstable prefix may go away. This PR also removes the blacklist on some 3PID tests which occurs in #6042, as the corresponding Sytest PR changes them to use the new endpoints. Finally, it also modifies the account deactivation code such that it doesn't just try to deactivate 3PIDs that were bound to the user's account, but any 3PIDs that were bound through the homeserver on that user's account.
* | | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2020-02-251-0/+5
|\| | | | | | | |
| * | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6066 This register endpoint should be disabled if registration is disabled, otherwise we're giving anyone the ability to check if a username exists on a server when we don't need to be. Error code is 403 (Forbidden) as that's the same returned by /register when registration is disabled.
* | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-252-64/+252
|\| | | | | | | |
| * | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-202-51/+225
| | | | | | | | |
* | | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint ↵Andrew Morgan2020-02-251-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6074)
| * | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint ↵Andrew Morgan2019-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6074) Remove trailing slash ability from the password reset submit_token endpoint. Since we provide the link in an email, and have never sent it with a trailing slash, there's no point for us to accept them on the endpoint.
* | | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2020-02-251-4/+0
|\| | | | | | | |
| * | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2019-09-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | As per [MSC2290](https://github.com/matrix-org/matrix-doc/pull/2290/files#diff-05cde9463e9209b701312b3baf2fb2ebR151), we're dropping the bind parameter from `/account/3pid`. This endpoint can now only be used for adding threepid's to the user's account on the homeserver.
* | | | | | | | | Use unstable prefix for 3PID unbind API (#6062)Andrew Morgan2020-02-251-1/+1
|\| | | | | | | |
| * | | | | | | | Use unstable prefix for 3PID unbind API (#6062)J. Ryan Stinnett2019-09-191-1/+1
| | | | | | | | |
* | | | | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2020-02-251-19/+0
|\| | | | | | | |
| * | | | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2019-09-191-17/+0
| | |/ / / / / / | |/| | | | | | | | | | | | | | Removes the POST method from `/password_reset/<medium>/submit_token/` as it's only used by phone number verification which Synapse does not support yet.
* | | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2020-02-251-0/+1
|\| | | | | | |
| * | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a redo of https://github.com/matrix-org/synapse/pull/5897 but with `id_access_token` accepted. Implements [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134) plus Identity Service v2 authentication ala [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140). Identity lookup-related functions were also moved from `RoomMemberHandler` to `IdentityHandler`.
* | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationAndrew Morgan2020-02-251-1/+2
|\| | | | | | |
| * | | | | | | Add changelogAndrew Morgan2019-09-101-1/+1
| | | | | | | |
| * | | | | | | Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-101-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fixAndrew Morgan2020-02-252-2/+2
|\| | | | | |
| * | | | | | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| * | | | | | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
| | | | | | |
* | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2020-02-255-162/+305
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987)
| * | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2019-09-065-162/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987) This is a combination of a few different PRs, finally all being merged into `develop`: * #5875 * #5876 * #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](https://github.com/matrix-org/synapse/commit/891afb57cbdf9867f2848341b29c75d6f35eef5a#diff-e591d42d30690ffb79f63bb726200891) in #5969. What's left is just giving /versions access to the config file, which could be useful in the future) * #5835 * #5969 * #5940 Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged. UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged.
* | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2020-02-251-5/+7
|\| | | | | |
| * | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-6/+7
| | | | | | |
* | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2020-02-251-0/+33
|\| | | | | |
| * | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-0/+33
| | |_|_|_|/ | |/| | | | | | | | | | Implements `POST /_matrix/client/r0/account/3pid/unbind` from [MSC2140](https://github.com/matrix-org/matrix-doc/blob/dbkr/tos_2/proposals/2140-terms-of-service-2.md#post-_matrixclientr0account3pidunbind).
* | | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2020-02-251-2/+0
|\| | | | |
| * | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-2/+0
| | | | | | | | | | | | | | | | | | Removes the `bind_email` and `bind_msisdn` parameters from the `/register` C/S API endpoint as per [MSC2140: Terms of Service for ISes and IMs](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R107).
* | | | | | Ensure the list media admin API is always available (#5966)Andrew Morgan2020-02-251-2/+5
|\| | | | |
| * | | | | Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure the list media admin API is always available This API is required for some external media repo implementations to operate (mostly for doing quarantine operations on a room). * changelog
* | | | | | Ensure an auth instance is available to ListMediaInRoom (#5967)Andrew Morgan2020-02-251-0/+1
|\| | | | |
| * | | | | Ensure an auth instance is available to ListMediaInRoom (#5967)Travis Ralston2019-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure an auth instance is available to ListMediaInRoom Fixes https://github.com/matrix-org/synapse/issues/5737 * Changelog
* | | | | | Remove double return statements (#5962)Andrew Morgan2020-02-253-4/+0
|\| | | | |
| * | | | | Remove double return statements (#5962)Andrew Morgan2019-09-033-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully.
* | | | | | Opentrace device lists (#5853)Andrew Morgan2020-02-252-2/+6
|\| | | | |
| * | | | | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-2/+6
| | | | | | | | | | | | | | | | | | Trace device list changes.
* | | | | | fix thumbnail storage location (#5915)Andrew Morgan2020-02-241-1/+1
|\| | | | |
| * | | | | fix thumbnail storage location (#5915)L0ric02019-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix thumbnail storage location Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Add changelog file. Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Update Changelog Signed-off-by: Lorenz Steinert <lorenz@steinerts.de>
* | | | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2020-02-241-6/+1
|\| | | | |
| * | | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-6/+1
| | | | | | | | | | | | | | | | | | This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58.
* | | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-2437-182/+182
|\| | | | |
| * | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3037-182/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :)
| * | | | | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-1/+6
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927
* | | | | Add m.id_access_token flag (#5930)Andrew Morgan2020-02-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927
* | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456.
* | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-241-2/+4
|\| | | |
* | | | | Merge pull request #5914 from matrix-org/rei/admin_getadminAndrew Morgan2020-02-212-9/+33
|\| | | |
| * | | | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-282-9/+33
| |\ \ \ \ | | | | | | | | | | | | Add GET method to admin API /users/@user:dom/admin
| | * | | | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-272-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyAndrew Morgan2020-02-211-13/+15
|\| | | | |
| * | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-271-13/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | Add config option to sign remote key query responses with a separate key.
| | * | | | | Fixup review commentsErik Johnston2019-08-231-2/+2
| | | | | | |
| | * | | | | Only sign when we respond to remote key requestsErik Johnston2019-08-211-13/+15
| | | | | | |
* | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlAndrew Morgan2020-02-211-1/+1
|\| | | | | |
| * | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-271-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | public_base_url is actually public_baseurl
| | * | | | | public_base_url is actually public_baseurlAaron Raimist2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | | | | Add Admin API capability to set adminship of a user (#5878)Andrew Morgan2020-02-212-0/+78
|\| | | | | |
| * | | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-272-0/+78
| |/ / / / / | | | | | | | | | | | | Admin API: Set adminship of a user
* | | | | | Merge pull request #5877 from ↵Andrew Morgan2020-02-211-51/+4
|\| | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration
| * | | | | Merge pull request #5877 from ↵Richard van der Hoff2019-08-221-53/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration Remove shared secret registration
| | * | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-53/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This type of registration was probably never used. It only includes the user name in the HMAC but not the password. Shared secret registration is still available via client/r0/admin/register. Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
| * | | | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-221-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3320aaab3a9bba3f5872371aba7053b41af9d0a0.
| * | | | | Add "require_consent" parameter for registrationHalf-Shot2019-08-221-1/+4
| | | | | |
* | | | | | Opentrace e2e keys (#5855)Andrew Morgan2020-02-211-1/+12
|\| | | | |
| * | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-1/+12
| | | | | | | | | | | | | | | | | | Add opentracing tags and logs for e2e keys
* | | | | | Servlet to purge old rooms (#5845)Andrew Morgan2020-02-212-0/+59
|\| | | | |
| * | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-222-0/+59
| |/ / / /
* | | | | Fix up password reset template config names (#5863)Andrew Morgan2020-02-201-2/+2
|\| | | |
| * | | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-2/+2
| |/ / / | | | | | | | | | | | | | | | | Fixes #5833 The emailconfig code was attempting to pull incorrect config file names. This corrects that, while also marking a difference between a config file variable that's a filepath versus a str containing HTML.
* | | | Don't load the media repo when configured to use an external media repo (#5754)Andrew Morgan2020-02-204-91/+143
|\| | |
| * | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-134-91/+143
| | | |
* | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2020-02-201-3/+11
|\| | |
| * | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-3/+11
| | | | | | | | | | | | | | | | | | | | Part of fixing matrix-org/sytest#652 Sytest PR: matrix-org/sytest#667
* | | | Account validity: allow defining HTML templates to serve the us… (#5807)Andrew Morgan2020-02-201-3/+3
|\| | |
| * | | LintBrendan Abolivier2019-08-011-4/+2
| | | |
| * | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+17
| | |/ | |/|
| * | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-243-9/+39
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
* | \ \ Fix servlet metric names (#5734)Andrew Morgan2020-02-193-9/+39
|\ \ \ \ | | |/ / | |/| |
| * | | Fix servlet metric names (#5734)Jorik Schellekens2019-07-243-9/+39
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * Fix servlet metric names Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Remove redundant check * Cover all return paths
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-1939-288/+270
|\ \ \ | | |/ | |/|
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2339-288/+270
| |/
* | Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2020-02-191-32/+43
|\| | | | | | | (#5629)
| * Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2019-07-181-32/+43
| | | | | | | | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted.
* | Implement access token expiry (#5660)Andrew Morgan2020-02-171-1/+1
|\|
| * fix typo: backgroud -> backgroundAndrew Morgan2019-07-121-1/+1
| |
* | Clean up exception handling for access_tokens (#5656)Andrew Morgan2020-02-172-4/+15
|\|
| * Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-112-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, let's get rid of `TOKEN_NOT_FOUND_HTTP_STATUS`. It was a hack we did at one point when it was possible to return either a 403 or a 401 if the creds were missing. We always return a 401 in these cases now (thankfully), so it's not needed. Let's also stop abusing `AuthError` for these cases. Honestly they have nothing that relates them to the other places that `AuthError` is used, other than the fact that they are loosely under the 'Auth' banner. It makes no sense for them to share exception classes. Instead, let's add a couple of new exception classes: `InvalidClientTokenError` and `MissingClientTokenError`, for the `M_UNKNOWN_TOKEN` and `M_MISSING_TOKEN` cases respectively - and an `InvalidClientCredentialsError` base class for the two of them.
* | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2020-02-171-2/+12
|\|
| * Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
| | | | | | | | | | | | | | A fix for PR #5626, which returned the original event content as part of a call to /relations. Only problem was that we were attempting to aggregate the relations on top of it when we did so. We now set bundle_aggregations to False in the get_event call. We also do this when pulling the relation events as well, because edits of edits are not something we'd like to support here.
* | Include the original event in /relations (#5626)Andrew Morgan2020-02-171-3/+5
|\|
| * Include the original event in /relations (#5626)Andrew Morgan2019-07-091-3/+5
| | | | | | When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances.
* | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-173-18/+10
|\|
| * Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-083-18/+10
| | | | | | | | | | | | | | | | Nothing uses this now, so we can remove the dead code, and clean up the API. Since we're changing the shape of the return value anyway, we take the opportunity to give the method a better name.
* | Factor out some redundant code in the login impl (#5639)Andrew Morgan2020-02-171-39/+10
|\|
| * Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
| | | | | | | | | | | | | | | | * Factor out some redundant code in the login impl Also fixes a redundant access_token which was generated during jwt login. * changelog
* | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-141-4/+3
| |
* | Fix account_validity incorrect email response contentAndrew Morgan2020-02-141-2/+5
| |
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-146-18/+14
|\|
| * Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-046-18/+14
| |
* | Fix media repo breaking (#5593)Andrew Morgan2020-02-141-0/+1
|\|
| * Fix media repo breaking (#5593)Amber Brown2019-07-021-0/+1
| |
* | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-142-43/+48
|\|
| * Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-022-43/+48
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * SAML2 Improvements and redirect stuff Signed-off-by: Alexander Trost <galexrt@googlemail.com> * Code cleanups and simplifications. Also: share the saml client between redirect and response handlers. * changelog * Revert redundant changes to static js * Move all the saml stuff out to a centralised handler * Add support for tracking SAML2 sessions. This allows us to correctly handle `allow_unsolicited: False`. * update sample config * cleanups * update sample config * rename BaseSSORedirectServlet for consistency * Address review comments
| | * Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-019-122/+75
| | |\
| | * | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | | |
| | * | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-262-44/+4
| | | |
| | * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-2657-1432/+1275
| | |\ \
| | * | | Code cleanups and simplifications.Richard van der Hoff2019-06-112-45/+42
| | | | | | | | | | | | | | | | | | | | Also: share the saml client between redirect and response handlers.
| | * | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-1039-321/+531
| | |\ \ \
| | * | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-021-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Trost <galexrt@googlemail.com>
* | | | | | Fix JWT login with new users (#5586)Andrew Morgan2020-02-141-6/+3
|\| | | | |
| * | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
* | | | | | fix async/await consentresource (#5585)Andrew Morgan2020-02-141-1/+3
|\| | | | |
| * | | | | fix async/await consentresource (#5585)Amber Brown2019-07-011-1/+3
| | |_|_|/ | |/| | | | | | | | Fixes #5582
* | | | | Make the http server handle coroutine-making REST servlets (#5475)Andrew Morgan2020-02-148-120/+73
|\| | | |
| * | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-298-120/+73
| | | | |
* | | | | Fix JWT login (#5555)Andrew Morgan2020-02-141-1/+1
|\| | | |
| * | | | Fix JWT login (#5555)PauRE2019-06-271-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix JWT login with register Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Add pyjwt conditional dependency Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Added changelog file Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com> * Improved changelog description Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
| * | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
| | | |
* | | | Run Black. (#5482)Andrew Morgan2020-02-133-13/+13
|\| | |
| * | | Run Black. (#5482)Amber Brown2019-06-2057-1426/+1254
| | | |
* | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1157-1476/+1291
| | | |
* | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-107-24/+174
|\ \ \ \
| * | | | Fix resetting password via a phone number (#21) dinsic_2020-02-10Andrew Morgan2020-01-241-1/+1
| | | | |
| * | | | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-222-1/+19
| | | | |
| * | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-121-2/+3
| | | | |
| * | | | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-021-16/+58
| | | | |
| * | | | Add a /user/:user_id/info servlet to give user deactivated/expired ↵Andrew Morgan2019-11-141-0/+89
| | | | | | | | | | | | | | | | | | | | information (#12)
| * | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-012-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198.
| * | | | Revert "Merge pull request #5932 from ↵Brendan Abolivier2019-09-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb.
| * | | | Revert "Ensure the password reset template is correctly converted to binary"Brendan Abolivier2019-09-091-2/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 665dd9f7f8db2f8d38f454d4d5b96efcf163a5db.
| * | | | Ensure the password reset template is correctly converted to binaryBrendan Abolivier2019-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | Regardless of the Python version
* | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileAndrew Morgan2020-02-101-2/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileErik Johnston2019-06-141-2/+4
| |\ \ \ \ | | | | | | | | | | | | Don't log exception when failing to fetch remote content.
| | * | | | Don't log exception when failing to fetch remote content.Erik Johnston2019-06-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, let's not log stack traces when we stop processing becuase the response body was too large.
* | | | | | Remove Python 2.7 support. (#5425)Andrew Morgan2020-02-101-4/+15
|\| | | | | | |_|/ / / |/| | | |
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-111-4/+5
| |\ \ \ \
| * | | | | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-111-4/+15
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the warning about password resets being disabled to the point where a user actually tries to reset their password. Is this an appropriate place for it to happen? Also removed the disabling of msisdn password resets when you don't have an email config, as that just doesn't make sense. Also change the error a user receives upon disabled passwords to specify that only email-based password reset is disabled.
| * | | | Merge pull request #5363 from ↵Brendan Abolivier2019-06-101-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | matrix-org/babolivier/account_validity_send_mail_auth Don't check whether the user's account is expired on /send_mail requests
* | | | | Fix encoding for account validity HTML files on Python 2Brendan Abolivier2019-08-291-1/+3
| | | | |
* | | | | LintBrendan Abolivier2019-08-011-1/+1
| | | | |
* | | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+15
| | | | |
* | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
| | | | |
* | | | | LintBrendan Abolivier2019-06-121-1/+0
| | | | |
* | | | | Fix path for password policy endpointsBrendan Abolivier2019-06-121-2/+2
| | | | |
* | | | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-1241-345/+558
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Change password reset links to /_matrix.Erik Johnston2019-06-111-4/+5
| |/ / /
| * | | Add ability to perform password reset via email without trusting the ↵Andrew Morgan2019-06-061-5/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identity server (#5377) Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368
| * | | Neilj/add r0.5 to versions (#5360)Neil Johnson2019-06-051-0/+1
| | | | | | | | | | | | * Update _matrix/client/versions to reference support for r0.5.0
| * | | Merge pull request #5333 from ↵Richard van der Hoff2019-06-041-10/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | matrix-org/rav/server_keys/09_improve_notary_server Fixes for the key-notary server
| | * | | Notary server: make requests to origins in parallelRichard van der Hoff2019-06-041-10/+2
| | | | | | | | | | | | | | | | | | | | ... else we're guaranteed to time out.
| * | | | Hawkowl/fix missing auth (#5328)Amber Brown2019-06-041-0/+1
| |/ / /
| * | / Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0337-305/+287
| | |/ | |/|
| * | Fix ignored filter field in `/messages` endpointEisha Chen-yen-su2019-05-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug which were causing the "event_format" field to be ignored in the filter of requests to the `/messages` endpoint of the CS API. Signed-off-by: Eisha Chen-yen-su <chenyensu0@gmail.com>
| * | Merge pull request #5256 from aaronraimist/logout-correct-errorErik Johnston2019-05-301-18/+9
| |\ \ | | | | | | | | Show correct error when logging out and access token is missing
| | * | LintAaron Raimist2019-05-291-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| | * | Get rid of try exceptAaron Raimist2019-05-271-16/+9
| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| | * | Show correct error when logging out and access token is missingAaron Raimist2019-05-241-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | Implement the SHHS complexity API (#5216)Amber Brown2019-05-301-3/+9
| | | |
| * | | Serve CAS login over r0 (#5286)Amber Brown2019-05-301-2/+2
| | | |
| * | | Fix error when downloading thumbnail with width/height param missing (#5258)Aaron Raimist2019-05-291-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Fix error when downloading thumbnail with width/height param missing Fixes #2748 Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-241-0/+3
| |\ \ | | | | | | | | Don't bundle aggregations with events in /sync or /events or state queries
| | * | Don't bundle events in /sync or /eventsErik Johnston2019-05-211-0/+3
| | | | | | | | | | | | | | | | | | | | As we'll send down the annotations too anyway, so this just ends up confusing clients.
| * | | Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchersErik Johnston2019-05-231-3/+3
| |\ \ \ | | | | | | | | | | Factor out KeyFetchers from KeyRing
| | * | | Fix remote_key_resourceRichard van der Hoff2019-05-231-3/+3
| | |/ /
| * / / Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-2/+3
| |/ / | | | | | | | | | | | | Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file.
* | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-115-5/+401
|\| |
| * | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-202-0/+340
| |\ \ | | | | | | | | Land basic reaction and edit support.
| | * | Move parsing of tokens out of storage layerErik Johnston2019-05-161-0/+19
| | | |
| | * | Check that event is visible in new APIsErik Johnston2019-05-161-2/+15
| | | |
| | * | Add aggregations APIErik Johnston2019-05-161-1/+140
| | | |
| | * | Actually implement idempotencyErik Johnston2019-05-151-1/+8
| | | |
| | * | Add simple pagination APIErik Johnston2019-05-151-0/+50
| | | |
| | * | Add simple send_relation API and track in DBErik Johnston2019-05-152-0/+112
| | | |
| * | | Fix image orientation when generating thumbnail (#5039)PauRE2019-05-162-0/+44
| | | |
| * | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-5/+17
| |\ \ \ | | | | | | | | | | Re-order registration stages to do msisdn & email auth last
| | * \ \ Merge remote-tracking branch 'origin/develop' into ↵David Baker2019-05-131-0/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | dbkr/add_dummy_flow_to_recaptcha_only
| | * | | | Re-order flows so that email auth is done lastDavid Baker2019-05-101-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's more natural for the user if the bit that takes them away from the registration flow comes last. Adding the dummy stage allows us to do the stages in this order without the ambiguity.
| | * | | | CommentDavid Baker2019-05-101-0/+4
| | | | | |
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-09-04 22:49:32 +0000