summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | changelogDavid Baker2019-09-121-0/+1
| | | | | | | | | |
* | | | | | | | | | add report_stats_endpoint config option (#6012)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | |
| * | | | | | | | | add report_stats_endpoint config option (#6012)Sorunome2019-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR adds the optional `report_stats_endpoint` to configure where stats are reported to, if enabled.
* | | | | | | | | | Blow up config if opentracing is missing (#5985)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | |
| * | | | | | | | | Blow up config if opentracing is missing (#5985)Jorik Schellekens2019-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Blow up config if opentracing is missing
* | | | | | | | | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-registerAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | |
| * | | | | | | | | Ensure support users can be registered even if MAU limit is reachedJason Robinson2019-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows support users to be created even on MAU limits via the admin API. Support users are excluded from MAU after creation, so it makes sense to exclude them in creation - except if the whole host is in disabled state. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | | | | | | | | 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 #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionErik Johnston2019-09-111-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Allow use of different ratelimits for admin redactions.
| | * | | | | | | | | NewsfileErik Johnston2019-09-111-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Clean up some code in the retry logic (#6017)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Clean up some code in the retry logic (#6017)Richard van der Hoff2019-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove some unused code * make things which were constants into constants for efficiency and clarity
* | | | | | | | | | | Add note about extra arg to send_membership_event, remove arg in ↵Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote_reject_invite (#6009)
| * | | | | | | | | | Add note about extra arg to send_membership_event, remove arg in ↵Andrew Morgan2019-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote_reject_invite (#6009) Some small fixes to `room_member.py` found while doing other PRs. 1. Add requester to the base `_remote_reject_invite` method. 2. `send_membership_event`'s docstring was out of date and took in a `remote_room_hosts` arg that was not used and no calling function provided.
* | | | | | | | | | | Check dependencies on setup in the nicer way. (#5989)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Check dependencies on setup in the nicer way. (#5989)Jorik Schellekens2019-09-111-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2019-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two things I missed while implementing [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R80). 1. Access tokens should be provided to the identity server as `access_token`, not `id_access_token`, even though the homeserver may accept the tokens as `id_access_token`. 2. Access tokens must be sent to the identity server in a query parameter, the JSON body is not allowed. We now send the access token as part of an `Authorization: ...` header, which fixes both things. The breaking code was added in https://github.com/matrix-org/synapse/pull/5892 Sytest PR: https://github.com/matrix-org/sytest/pull/697
* | | | | | | | | | | Remove origin parameter from add_display_name_to_third_party_invite and add ↵Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | params to docstring (#6010)
| * | | | | | | | | | Remove origin parameter from add_display_name_to_third_party_invite and add ↵Andrew Morgan2019-09-111-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | params to docstring (#6010) Another small fixup noticed during work on a larger PR. The `origin` field of `add_display_name_to_third_party_invite` is not used and likely was just carried over from the `on_PUT` method of `FederationThirdPartyInviteExchangeServlet` which, like all other servlets, provides an `origin` argument. Since it's not used anywhere in the handler function though, we should remove it from the function arguments.
* | | | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationErik Johnston2019-09-101-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use account_threepid_delegate for 3pid validation
| | * | | | | | | | | Add changelogAndrew Morgan2019-09-101-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersJason Robinson2019-09-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only count real users when checking for auto-creation of auto-join room
| | * | | | | | | | | | Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-091-0/+1
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if the first registered user was a "support" or "bot" user, when the first real user registers, the auto-join rooms were not created. Fix to exclude non-real (ie users with a special user type) users when counting how many users there are to determine whether we should auto-create a room. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | | | | | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Censor redactions in DB after a month
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-0521-1/+20
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/censor_redactions
| | * | | | | | | | | | | NewsfileErik Johnston2019-08-301-0/+1
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
* | | | | | | | | | | | Add a build info metric to Prometheus (#6005)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Add a build info metric to Prometheus (#6005)Amber Brown2019-09-101-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6003 from matrix-org/erikj/push_opentracingAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | NewsfileErik Johnston2019-09-091-0/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Servers-known-about statistic (#5981)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Servers-known-about statistic (#5981)Amber Brown2019-09-071-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2019-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sid` is required to be part of `three_pid_creds`. We were 500'ing if it wasn't provided instead of returning `M_MISSING_PARAM`.
* | | | | | | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flagAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flagErik Johnston2019-09-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | Correctly handle non-bool m.federate flag
| | * | | | | | | | | NewsfileErik Johnston2019-09-061-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5993 from matrix-org/anoa/worker_store_regAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5993 from matrix-org/anoa/worker_store_regErik Johnston2019-09-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move get_threepid_validation_session and delete_threepid_session into RegistrationWorkerStore
| | * | | | | | | | | | Change changelogAndrew Morgan2019-09-062-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Add changelogAndrew Morgan2019-09-061-0/+1
| | |/ / / / / / / / /
* | | | | | | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fixAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Add changelogAndrew Morgan2019-09-061-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcsAndrew Morgan2020-02-251-0/+1
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcsErik Johnston2019-09-061-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Don't assume there is a 'self' arg in @trace decorator
| | * | | | | | | | | Update changelogErik Johnston2019-09-061-1/+1
| | | | | | | | | | |
| | * | | | | | | | | NewsfileErik Johnston2019-09-061-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2020-02-256-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987)
| * | | | | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2019-09-066-0/+6
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Trace how long it takes for the send trasaction to complete, including ↵Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrys (#5986)
| * | | | | | | | | Trace how long it takes for the send trasaction to complete, including ↵Jorik Schellekens2019-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrys (#5986)
* | | | | | | | | | Gracefully handle log context slips and missing opentracing import errors. ↵Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5988)
| * | | | | | | | | Gracefully handle log context slips and missing opentracing import errors. ↵Jorik Schellekens2019-09-051-0/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | (#5988)
* | | | | | | | | Merge pull request #5984 from ↵Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/joriks/opentracing_link_send_to_edu_contexts
| * | | | | | | | Merge pull request #5984 from ↵Erik Johnston2019-09-051-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/joriks/opentracing_link_send_to_edu_contexts Link the send loop with the edus contexts
| | * | | | | | | | Bugfix phrasingJorik Schellekens2019-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| | * | | | | | | | newsfileJorik Schellekens2019-09-051-0/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Add opentracing to all client servlets (#5983)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | |
| * | | | | | | | Add opentracing to all client servlets (#5983)Jorik Schellekens2019-09-051-0/+1
| | | | | | | | |
* | | | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | |
| * | | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-0/+1
| | | | | | | | |
* | | | | | | | | Fix opentracing contexts missing from outbound replication requests (#5982)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | |
| * | | | | | | | Fix opentracing contexts missing from outbound replication requests (#5982)Jorik Schellekens2019-09-051-0/+1
| | | | | | | | |
* | | | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2020-02-251-0/+1
|\| | | | | | | |
| * | | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | 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-0/+1
|\| | | | | | |
| * | | | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | | Cleanup event auth type initialisation (#5975)Andrew Morgan2020-02-251-0/+1
|\| | | | | | |
| * | | | | | | Cleanup event auth type initialisation (#5975)Andrew Morgan2019-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Very small code cleanup.
* | | | | | | | Fix and refactor room and user stats (#5971)Andrew Morgan2020-02-251-0/+1
|\| | | | | | |
| * | | | | | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previously the stats were not being correctly populated.
* | | | | | | | Ensure the list media admin API is always available (#5966)Andrew Morgan2020-02-251-0/+1
|\| | | | | | |
| * | | | | | | Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | Docker packaging should not su-exec or chmod if already running as UID/GID ↵Andrew Morgan2020-02-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5970)
| * | | | | | | Docker packaging should not su-exec or chmod if already running as UID/GID ↵Michael Kaye2019-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#5970) Adjust su-exec to only be used if needed. If UID == getuid() and GID == getgid() then we do not need to su-exec, and chmod will not work.
* | | | | | | | 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-251-0/+1
|\| | | | | | |
| * | | | | | | Remove double return statements (#5962)Andrew Morgan2019-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+1
|\| | | | | | |
| * | | | | | | Opentrace device lists (#5853)Jorik Schellekens2019-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Trace device list changes.
* | | | | | | | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2020-02-241-0/+1
|\| | | | | | |
| * | | | | | | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2019-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | These methods were part of the v1 C/S API. Remove them as they are no longer used by any code paths.
* | | | | | | | fix thumbnail storage location (#5915)Andrew Morgan2020-02-241-0/+1
|\| | | | | | |
| * | | | | | | fix thumbnail storage location (#5915)L0ric02019-09-021-0/+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>
* | | | | | | | Update INSTALL.md to say that Python 2 is no longer supported (#5953)Andrew Morgan2020-02-241-0/+1
|\| | | | | | |
| * | | | | | | Update INSTALL.md to say that Python 2 is no longer supported (#5953)Aaron Raimist2019-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | | | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2020-02-241-1/+0
|\| | | | | | |
| * | | | | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58.
* | | | | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-241-0/+1
|\| | | | | | |
| * | | | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :)
| * | | | | | | Move buildkite config to the pipelines repo (#5943)Amber Brown2019-08-311-0/+1
| | | | | | | |
| * | | | | | | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Removed unused jenkins/ folder and script (#5938)Amber Brown2019-08-301-0/+1
| | | | | | | |
| * | | | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 71fc04069a5770a204c3514e0237d7374df257a8. This broke 3PID invites as #5892 was required for it to work correctly.
* | | | | | | | Move buildkite config to the pipelines repo (#5943)Amber Brown2020-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: I kept it in the repo for now ~anoa
* | | | | | | | Add m.id_access_token flag (#5930)Andrew Morgan2020-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Removed unused jenkins/ folder and script (#5938)Amber Brown2020-02-241-0/+1
| | | | | | | |
* | | | | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456.
* | | | | | | | Fix coverage in sytest and use plugins for buildkite (#5922)Andrew Morgan2020-02-241-0/+1
|\| | | | | | |
| * | | | | | | Fix coverage in sytest and use plugins for buildkite (#5922)Amber Brown2019-08-291-0/+1
| |/ / / / / /
* | | | | | | Add a link to python's logging config schema (#5926)Andrew Morgan2020-02-241-0/+1
|\| | | | | |
| * | | | | | Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-281-0/+1
| | | | | | |
* | | | | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentAndrew Morgan2020-02-241-0/+1
|\| | | | | |
| * | | | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-281-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Exempt support users from consent
| | * | | | | | Removing entry for 5903Will Hunt2019-08-281-1/+0
| | | | | | | |
| | * | | | | | Update changelogHalf-Shot2019-08-231-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consentHalf-Shot2019-08-231-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | Add changelogHalf-Shot2019-08-231-0/+1
| | | | | | | | |
| | * | | | | | | newsfile 5902Half-Shot2019-08-231-0/+1
| | |/ / / / / /
* | | | | | | | Let synctl use a config directory. (#5904)Andrew Morgan2020-02-241-0/+1
|\| | | | | | |
| * | | | | | | Let synctl use a config directory. (#5904)Jorik Schellekens2019-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * Let synctl use a config directory.
* | | | | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-241-0/+1
|\| | | | | | |
| * | | | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/5861 Adds support for the v2 lookup API as defined in [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134). Currently this is only used for 3PID invites. Sytest PR: https://github.com/matrix-org/sytest/pull/679
* | | | | | | | Config templating (#5900)Andrew Morgan2020-02-211-0/+1
|\| | | | | | |
| * | | | | | | Config templating (#5900)Jorik Schellekens2019-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template config files * Imagine a system composed entirely of x, y, z etc and the basic operations.. Wait George, why XOR? Why not just neq? George: Eh, I didn't think of that.. Co-Authored-By: Erik Johnston <erik@matrix.org>
* | | | | | | | Implement a structured logging output system. (#5680)Andrew Morgan2020-02-211-0/+1
|\| | | | | | |
| * | | | | | | Implement a structured logging output system. (#5680)Amber Brown2019-08-281-0/+1
| | | | | | | |
* | | | | | | | Fix a cache-invalidation bug for worker-based deployments (#5920)Andrew Morgan2020-02-211-0/+1
|\| | | | | | |
| * | | | | | | Fix a cache-invalidation bug for worker-based deployments (#5920)Richard van der Hoff2019-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the caches on worker processes were not being correctly invalidated when a room's state was changed in a way that did not affect the membership list of the room. We need to make sure we send out cache invalidations even when no memberships are changing.
* | | | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadminAndrew Morgan2020-02-211-0/+1
|\| | | | | | |
| * | | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-281-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add GET method to admin API /users/@user:dom/admin
| | * | | | | | | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197Andrew Morgan2020-02-211-0/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-281-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MSC2197 Search Filters over Federation
| | * | | | | | | | Newsfile on one lineOlivier Wilkinson (reivilibre)2019-08-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| | * | | | | | | | NewsfileOlivier Wilkinson (reivilibre)2019-08-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | | | | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookupsAndrew Morgan2020-02-211-0/+1
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookupsErik Johnston2019-08-271-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Refactor MatrixFederationAgent to retry SRV.
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-08-2213-0/+13
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/reliable_lookups
| | * | | | | | | | | | Make changelog entry be a featureErik Johnston2019-08-201-0/+0
| | | | | | | | | | | |
| | * | | | | | | | | | NewsfileErik Johnston2019-08-151-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Allow schema deltas to be engine-specific (#5911)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Allow schema deltas to be engine-specific (#5911)reivilibre2019-08-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow schema deltas to be engine-specific Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> * Code style (Black) Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
| | * | | | | | | | | | | NewsfileOlivier Wilkinson (reivilibre)2019-08-271-0/+1
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | | | | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitAndrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitRichard van der Hoff2019-08-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Increase profile display name limit
| | * | | | | | | | | | | Increase max display name limitNeil Johnson2019-08-241-0/+1
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyAndrew Morgan2020-02-212-1/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add config option to sign remote key query responses with a separate key.
| | * | | | | | | | | | | NewsfileErik Johnston2019-08-211-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update 5909.miscRichard van der Hoff2019-08-271-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlAndrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | public_base_url is actually public_baseurl
| | * | | | | | | | | | | Add changelogAaron Raimist2019-08-261-0/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | | | | | | | | | Add Admin API capability to set adminship of a user (#5878)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-271-0/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Admin API: Set adminship of a user
* | | | | | | | | | | Propagate opentracing contexts through EDUs (#5852)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate opentracing contexts through EDUs Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | | | | | | | | | Merge pull request #5877 from ↵Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration
| * | | | | | | | | | Merge pull request #5877 from ↵Richard van der Hoff2019-08-221-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration Remove shared secret registration
| | * | | | | | | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | | Opentracing across workers (#5771)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Opentracing across workers (#5771)Jorik Schellekens2019-08-221-0/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate opentracing contexts across workers Also includes some Convenience modifications to opentracing for servlets, notably: - Add boolean to skip the whitelisting check on inject extract methods. - useful when injecting into carriers locally. Otherwise we'd always have to include our own servername and whitelist our servername - start_active_span_from_request instead of header - Add boolean to decide whether to extract context from a request to a servlet
* | | | | | | | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failAndrew Morgan2020-02-211-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failErik Johnston2019-08-221-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Retry well known on fail
| | * | | | | | | | | | Fixup changelog and remove debug loggingErik Johnston2019-08-162-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | NewsfileErik Johnston2019-08-151-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Opentrace e2e keys (#5855)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add opentracing tags and logs for e2e keys
* | | | | | | | | | | | Add missing index on users_in_public_rooms. (#5894)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Add missing index on users_in_public_rooms. (#5894)Richard van der Hoff2019-08-221-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Servlet to purge old rooms (#5845)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-221-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Improve error msg when key-fetch fails (#5896)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Improve error msg when key-fetch fails (#5896)Richard van der Hoff2019-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no point doing a raise_from here, because the exception is always logged at warn with no stacktrace in the caller. Instead, let's try to give better messages to reduce confusion. In particular, this means that we won't log 'Failed to connect to remote server' when we don't even attempt to connect to the remote server due to blacklisting.
* | | | | | | | | | | | Drop some unused tables. (#5893)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Drop some unused tables. (#5893)Richard van der Hoff2019-08-211-0/+1
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | These tables are never used, so we may as well drop them.
* | | | | | | | | | | Refactor the Appservice scheduler code (#5886)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Refactor the Appservice scheduler code (#5886)Richard van der Hoff2019-08-201-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too.
| | * | | | | | | | | | Refactor the Appservice scheduler codeRichard van der Hoff2019-08-201-0/+1
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too.
* | | | | | | | | | | Avoid deep recursion in appservice recovery (#5885)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Avoid deep recursion in appservice recovery (#5885)Richard van der Hoff2019-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully, this will fix a stack overflow when recovering an appservice. The recursion here leads to a huge chain of deferred callbacks, which then overflows the stack when the chain completes. `inlineCallbacks` makes a better job of this if we use iteration instead. Clean up the code a bit too, while we're there.
* | | | | | | | | | | Opentracing doc update (#5776)Andrew Morgan2020-02-211-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Opentracing doc update (#5776)Jorik Schellekens2019-08-201-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | Update opentracing docs to use the unified 'trace' method
* | | | | | | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsAndrew Morgan2020-02-211-0/+1
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-191-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove logging for #5407 and update comments
| | * | | | | | | | | NewsfileErik Johnston2019-08-161-0/+1
| | |/ / / / / / / /
* | | | | | | | | | 1.3.1Andrew Morgan2020-02-202-2/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | 1.3.1 v1.3.1 github/release-v1.3.1 release-v1.3.1Richard van der Hoff2019-08-172-2/+0
| | | | | | | | | |
* | | | | | | | | | Drop dependency on sdnotify (#5871)Andrew Morgan2020-02-202-0/+2
|\| | | | | | | | |
| * | | | | | | | | Drop dependency on sdnotify (#5871)Richard van der Hoff2019-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save OSes which don't use it from having to maintain a port. Fixes #5865.
| * | | | | | | | | add attributionRichard van der Hoff2019-08-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Add changelog entry.Chris Moos2019-08-161-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_indexAndrew Morgan2020-02-201-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_indexHubert Chathi2019-08-161-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | add the version field to the index for e2e_room_keys
| | * | | | | | | | | fix changelogHubert Chathi2019-08-151-1/+1
| | | | | | | | | | |
| | * | | | | | | | | add changelogHubert Chathi2019-08-141-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Opentracing misc (#5856)Andrew Morgan2020-02-201-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Opentracing misc (#5856)Jorik Schellekens2019-08-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add authenticated_entity and servlet_names tags. Functionally: - Add a tag for authenticated_entity - Add a tag for servlet_names Stylistically: Moved to importing methods directly from opentracing.
* | | | | | | | | | | Fix up password reset template config names (#5863)Andrew Morgan2020-02-201-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | 1.3.0Andrew Morgan2020-02-202-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 1.3.0 v1.3.0 github/release-v1.3.0 release-v1.3.0Brendan Abolivier2019-08-152-3/+0
| | | | | | | | | | |
* | | | | | | | | | | Remove libsqlite3-dev from required build dependencies. (#5766)Andrew Morgan2020-02-201-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Remove libsqlite3-dev from required build dependencies. (#5766)Andrew Morgan2019-08-151-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5851 from matrix-org/rei/roomdir_maybedeferredAndrew Morgan2020-02-201-0/+2
|\| | | | | | | | | |
| * | | | | | | | | | Update changelog.d/5851.bugfix reivilibre2019-08-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use imperative Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | | | | | | | | NewsfileOlivier Wilkinson (reivilibre)2019-08-141-0/+2
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
* | | | | | | | | | Don't create broken room when power_level_content_override.users does not ↵Andrew Morgan2020-02-201-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | contain creator_id. (#5633)
| * | | | | | | | | Don't create broken room when power_level_content_override.users does not ↵Michael Telatynski2019-08-151-0/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | contain creator_id. (#5633)
* | | | | | | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupAndrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-141-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Retry well-known lookup before expiry.
| | * | | | | | | NewsfileErik Johnston2019-08-131-0/+1
| | | | | | | | |
* | | | | | | | | 1.3.0rc1Andrew Morgan2020-02-2061-61/+0
|\| | | | | | | |
| * | | | | | | | 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-1361-61/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startupAndrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | changelogAmber H. Brown2019-08-141-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopAndrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-131-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Handle pusher being deleted during processing.
| | * | | | | | | NewsfileErik Johnston2019-08-011-0/+1
| | | | | | | | |
* | | | | | | | | Don't load the media repo when configured to use an external media repo (#5754)Andrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-131-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownAndrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-131-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a lower bound to well-known TTL.
| | * | | | | | | | NewsfileErik Johnston2019-08-121-0/+1
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesAndrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-131-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't unnecessarily block notifying of new events.
| | * | | | | | | | NewsfileErik Johnston2019-08-061-0/+1
| | | | | | | | | |
* | | | | | | | | | Cross-signing [1/4] -- hidden devices (#5759)Andrew Morgan2020-02-201-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Cross-signing [1/4] -- hidden devices (#5759)Hubert Chathi2019-08-121-0/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow devices to be marked as "hidden" This is a prerequisite for cross-signing, as it allows us to create other things that live within the device namespace, so they can be used for signatures.
* | | | | | | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_visAndrew Morgan2020-02-201-0/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_visErik Johnston2019-08-121-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Whitelist history visbility sytests for worker mode
| | * | | | | | | | NewsfileErik Johnston2019-08-121-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-scriptAndrew Morgan2020-02-201-0/+1
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-scriptErik Johnston2019-08-121-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | Fix curl command typo in purge_remote_media.sh
| | * | | | | | | | Changelogs should end in '.' or '!'Erik Johnston2019-08-121-1/+1
| | | | | | | | | |
| | * | | | | | | | Fix curl command typo in purge_remote_media.shThomas Citharel2019-08-091-0/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was verbose option instead of -X, command didn't work Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | | | | | Merge pull request #5788 from matrix-org/rav/metaredactionsAndrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fix handling of redactions of redactions
| | * | | | | | | changelogRichard van der Hoff2019-07-301-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncAndrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-061-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle TimelineBatch being limited and empty.
| | * | | | | | | | NewsfileErik Johnston2019-08-061-0/+1
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing matrix-org/sytest#652 Sytest PR: matrix-org/sytest#667
| * | | | | | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-011-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| | * | | | | | | ChangelogBrendan Abolivier2019-08-011-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableAndrew Morgan2020-02-201-0/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-011-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Return 502 not 500 when failing to reach any remote server.
| | * | | | | | | | NewsfileErik Johnston2019-08-011-0/+1
| | | | | | | | | |
* | | | | | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2020-02-201-0/+1
|\| | | | | | | | |
| * | | | | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5803
* | | | | | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorAndrew Morgan2020-02-201-0/+1
|\| | | | | | | | |