Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove SnapshotCache in favour of ResponseCache | Erik Johnston | 2019-12-09 | 3 | -168/+8 |
| | |||||
* | Merge pull request #6493 from matrix-org/erikj/invite_state_config | Erik Johnston | 2019-12-09 | 2 | -1/+4 |
|\ | | | | | Pull out room_invite_state_types config option once. | ||||
| * | Newsfile | Erik Johnston | 2019-12-09 | 1 | -0/+1 |
| | | |||||
| * | Pull out room_invite_state_types config option once. | Erik Johnston | 2019-12-09 | 1 | -1/+3 |
| | | | | | | | | Pulling things out of config is currently surprisingly expensive. | ||||
* | | Fix inaccurate per-block metrics (#6491) | Richard van der Hoff | 2019-12-09 | 2 | -42/+19 |
| | | | | | | | | | | `Measure` incorrectly assumed that it was the only thing being done by the parent `LoggingContext`. For instance, during a "renew group attestations" operation, hundreds of `outbound_request` calls could take place in parallel, all using the same `LoggingContext`. This would mean that any resources used during *any* of those calls would be reported against *all* of them, producing wildly inaccurate results. Instead, we now give each `Measure` block its own `LoggingContext` (using the parent `LoggingContext` mechanism to ensure that the log lines look correct and that the metrics are ultimately propogated to the top level for reporting against requests/backgrond tasks). | ||||
* | | Remove fallback for missing /federation/v1/state_ids API (#6488) | Richard van der Hoff | 2019-12-09 | 3 | -96/+18 |
| | | | | | | | | This API was added way back in 0.17.0; the code here is annoying to maintain and entirely redundant. | ||||
* | | Merge pull request #6484 from matrix-org/erikj/port_sync_handler | Erik Johnston | 2019-12-09 | 12 | -202/+208 |
|\ \ | |/ |/| | Port SyncHandler to async/await | ||||
| * | Fixup functions to consistently return deferreds | Erik Johnston | 2019-12-06 | 6 | -14/+28 |
| | | |||||
| * | Newsfile | Erik Johnston | 2019-12-05 | 1 | -0/+1 |
| | | |||||
| * | Port SyncHandler to async/await | Erik Johnston | 2019-12-05 | 6 | -191/+182 |
| | | |||||
* | | Merge pull request #6469 from matrix-org/erikj/make_database_class | Erik Johnston | 2019-12-06 | 68 | -2514/+2685 |
|\ \ | | | | | | | Create a Database class and move methods out of SQLBaseStore | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-12-06 | 56 | -823/+766 |
| |\ \ | |/ / |/| | | | | | erikj/make_database_class | ||||
* | | | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) | Manuel Stahl | 2019-12-05 | 9 | -109/+161 |
| |/ |/| | |||||
* | | Merge pull request #6483 from matrix-org/erikj/port_rest_v2 | Erik Johnston | 2019-12-05 | 24 | -505/+362 |
|\ \ | | | | | | | Port rest client v2_alpha to async/await | ||||
| * | | Newsfile | Erik Johnston | 2019-12-05 | 1 | -0/+1 |
| | | | |||||
| * | | Port rest.client.v2 | Erik Johnston | 2019-12-05 | 23 | -505/+361 |
|/ / | |||||
* | | Merge pull request #6482 from matrix-org/erikj/port_rest_v1 | Erik Johnston | 2019-12-05 | 15 | -169/+134 |
|\ \ | | | | | | | Port rest/v1 to async/await | ||||
| * | | Newsfile | Erik Johnston | 2019-12-05 | 1 | -0/+1 |
| | | | |||||
| * | | Fixup tests | Erik Johnston | 2019-12-05 | 3 | -2/+15 |
| | | | |||||
| * | | Port rest/v1 to async/await | Erik Johnston | 2019-12-05 | 11 | -167/+118 |
| | | | |||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Andrew Morgan | 2019-12-05 | 3 | -2/+23 |
|\ \ \ | |||||
| * | | | Modify systemd unit file reference to align with installation instruction ↵ | Clifford Garwood II | 2019-12-05 | 3 | -2/+23 |
| | | | | | | | | | | | | | | | | | | | | (#6369) Signed-off-by: Clifford Garwood II cliff@cigii.com | ||||
* | | | | Revert "Modify systemd unit file reference to align with installation ↵ | Andrew Morgan | 2019-12-05 | 3 | -23/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | instruction (#6369)" This reverts commit dc8747895ec026c365e687853b5ca12225fb881e. | ||||
* | | | | Modify systemd unit file reference to align with installation instruction ↵ | Clifford Garwood II | 2019-12-05 | 3 | -2/+23 |
| |/ / |/| | | | | | | | | | | | (#6369) Signed-off-by: Clifford Garwood II cliff@cigii.com | ||||
* | | | Stronger typing in the federation handler (#6480) | Richard van der Hoff | 2019-12-05 | 2 | -24/+58 |
| | | | | | | | | | | | | | | | replace the event_info dict with an attrs thing | ||||
* | | | Sanity-check the rooms of auth events before pulling them in. (#6472) | Richard van der Hoff | 2019-12-05 | 2 | -9/+26 |
| | | | |||||
| | * | Remove unused var | Erik Johnston | 2019-12-06 | 3 | -4/+2 |
| | | | |||||
| | * | Fix DB scripts | Erik Johnston | 2019-12-05 | 2 | -15/+16 |
| | | | |||||
| | * | Newsfile | Erik Johnston | 2019-12-05 | 1 | -0/+1 |
| | | | |||||
| | * | Move background update handling out of store | Erik Johnston | 2019-12-05 | 27 | -200/+281 |
| | | | |||||
| | * | Comments | Erik Johnston | 2019-12-05 | 3 | -5/+16 |
| | | | |||||
| | * | Move DB pool and helper functions into dedicated Database class | Erik Johnston | 2019-12-05 | 62 | -2295/+2377 |
| |/ |/| | |||||
* | | Merge pull request #6464 from matrix-org/erikj/make_public_sql_base | Erik Johnston | 2019-12-05 | 59 | -576/+570 |
|\ \ | | | | | | | Clean up SQLBaseStore private function usage | ||||
| * | | Newsfile | Erik Johnston | 2019-12-04 | 1 | -0/+1 |
| | | | |||||
| * | | Remove underscore from SQLBaseStore functions | Erik Johnston | 2019-12-04 | 56 | -558/+550 |
| | | | |||||
| * | | Don't call SQLBaseStore methods from outside stores | Erik Johnston | 2019-12-04 | 4 | -19/+20 |
| | | | |||||
* | | | Merge pull request #6470 from matrix-org/babolivier/port_db_ci_failure | Brendan Abolivier | 2019-12-04 | 3 | -2/+14 |
|\ \ \ | | | | | | | | | Make synapse_port_db exit with a non-0 code if something failed | ||||
| * | | | Fix background updates for synapse_port_db | Brendan Abolivier | 2019-12-04 | 2 | -2/+12 |
| | | | | |||||
| * | | | Changelog | Brendan Abolivier | 2019-12-04 | 1 | -0/+1 |
| | | | | |||||
| * | | | Make synapse_port_db exit with a non-0 code if something failed | Brendan Abolivier | 2019-12-04 | 1 | -0/+1 |
| |/ / | |||||
* / / | get rid of (most of) have_events from ↵ | Richard van der Hoff | 2019-12-04 | 3 | -72/+25 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | _update_auth_events_and_context_for_auth (#6468) have_events was a map from event_id to rejection reason (or None) for events which are in our local database. It was used as filter on the list of event_ids being passed into get_events_as_list. However, since get_events_as_list will ignore any event_ids that are unknown or rejected, we can equivalently just leave it to get_events_as_list to do the filtering. That means that we don't have to keep `have_events` up-to-date, and can use `have_seen_events` instead of `get_seen_events_with_rejection` in the one place we do need it. | ||||
* | | Merge pull request #6454 from matrix-org/erikj/clean_base_Store | Erik Johnston | 2019-12-04 | 9 | -192/+222 |
|\ \ | | | | | | | Move things out of SQLBaseStore | ||||
| * | | Revert "Move get_user_count_txn out of base store" | Erik Johnston | 2019-12-04 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | | | This reverts commit 00f0d67566cdfe8eae44aeae1c982c42a255cfcd. Its going to get removed soon, so lets not make merge conflicts. | ||||
| * | | _CURRENT_STATE_CACHE_NAME is public | Erik Johnston | 2019-12-04 | 2 | -5/+5 |
| | | | |||||
| * | | Move get_user_count_txn out of base store | Erik Johnston | 2019-12-04 | 2 | -12/+12 |
| | | | |||||
| * | | Newsfile | Erik Johnston | 2019-12-04 | 1 | -0/+1 |
| | | | |||||
| * | | Move cache invalidation to main data store | Erik Johnston | 2019-12-04 | 6 | -113/+143 |
| | | | |||||
| * | | Move event fetch vars to EventWorkStore | Erik Johnston | 2019-12-04 | 4 | -14/+15 |
| | | | |||||
| * | | Move account validity bg updates to registration store | Erik Johnston | 2019-12-04 | 2 | -66/+64 |
| | | | |||||
* | | | Merge pull request #6441 from syamgk/fix-parameter-mismatch | Erik Johnston | 2019-12-04 | 2 | -1/+2 |
|\ \ \ | | | | | | | | | Fix issue #6406 parameter mismatch | ||||
| * | | | Add changelog file | Syam G Krishnan | 2019-12-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Syam G Krishnan <syamgk@gmail.com> | ||||
| * | | | Issue #6406 Fix parameter mismatch | Syam G Krishnan | 2019-12-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Syam G Krishnan <syamgk01@gmail.com> | ||||
* | | | | Merge pull request #6329 from matrix-org/babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 10 | -103/+408 |
|\ \ \ \ | | | | | | | | | | | Filter state, events_before and events_after in /context requests | ||||
| * | | | | Un-remove room purge test | Brendan Abolivier | 2019-12-04 | 1 | -0/+72 |
| | | | | | |||||
| * | | | | Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse ↵ | Brendan Abolivier | 2019-12-04 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into babolivier/context_filters | ||||
| | * \ \ \ | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-11-26 | 125 | -1166/+2323 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 189 | -1451/+4493 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Incorporate review | Brendan Abolivier | 2019-12-04 | 3 | -3/+2 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Format changelog | Brendan Abolivier | 2019-11-20 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Update changelog since this isn't going to be featured in 1.6.0 | Brendan Abolivier | 2019-11-20 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Also filter state events | Brendan Abolivier | 2019-11-06 | 1 | -1/+7 |
| | | | | | | | |||||
| * | | | | | | Only filter if a filter was provided | Brendan Abolivier | 2019-11-05 | 1 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | Update copyright | Brendan Abolivier | 2019-11-05 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Lint | Brendan Abolivier | 2019-11-05 | 1 | -30/+41 |
| | | | | | | | |||||
| * | | | | | | Update copyrights | Brendan Abolivier | 2019-11-05 | 8 | -2/+21 |
| | | | | | | | |||||
| * | | | | | | Changelog | Brendan Abolivier | 2019-11-05 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add tests for /search | Brendan Abolivier | 2019-11-05 | 1 | -44/+143 |
| | | | | | | | |||||
| * | | | | | | Merge labels tests for /context and /messages | Brendan Abolivier | 2019-11-05 | 1 | -146/+130 |
| | | | | | | | |||||
| * | | | | | | Add test case | Brendan Abolivier | 2019-11-05 | 1 | -0/+182 |
| | | | | | | | |||||
| * | | | | | | Filter events_before and events_after in /context requests | Brendan Abolivier | 2019-11-05 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the current version of the spec doesn't say much about how this endpoint uses filters (see https://github.com/matrix-org/matrix-doc/issues/2338), the current implementation is that some fields of an EventFilter apply (the ones that are used when running the SQL query) and others don't (the ones that are used by the filter itself) because we don't call event_filter.filter(...). This seems counter-intuitive and probably not what we want so this commit fixes it. | ||||
* | | | | | | | Markdownification and other fixes to CONTRIBUTING (#6461) | Andrew Morgan | 2019-12-04 | 4 | -210/+215 |
| | | | | | | | |||||
* | | | | | | | Fix error when using synapse_port_db on a vanilla synapse db (#6449) | Andrew Morgan | 2019-12-04 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Update changelog.d/6449.bugfix | Andrew Morgan | 2019-12-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
| * | | | | | | Add changelog | Andrew Morgan | 2019-12-02 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fix error when using synapse_port_db on a vanilla synapse db | Andrew Morgan | 2019-12-02 | 1 | -1/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6451 from matrix-org/uhoreg/cross_signing_signatures_index | Erik Johnston | 2019-12-04 | 3 | -1/+25 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | make cross signing signature index non-unique | ||||
| * | | | | | | | apply changes from review | Hubert Chathi | 2019-12-03 | 2 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | add changelog | Hubert Chathi | 2019-12-02 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | make cross signing signature index non-unique | Hubert Chathi | 2019-12-02 | 2 | -1/+23 |
| |/ / / / / / | |||||
* | | | | | | | privacy by default for room dir (#6355) | Neil Johnson | 2019-12-04 | 5 | -18/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that the the default settings for the room directory are that the it is hidden from public view by default. | ||||
* | | | | | | | Fix exception when a cross-signed device is deleted (#6462) | Richard van der Hoff | 2019-12-04 | 2 | -4/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (hopefully) ... and deobfuscate the relevant bit of code. | ||||
* | | | | | | | Add ephemeral messages support (MSC2228) (#6409) | Brendan Abolivier | 2019-12-03 | 8 | -7/+379 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement part [MSC2228](https://github.com/matrix-org/matrix-doc/pull/2228). The parts that differ are: * the feature is hidden behind a configuration flag (`enable_ephemeral_messages`) * self-destruction doesn't happen for state events * only implement support for the `m.self_destruct_after` field (not the `m.self_destruct` one) * doesn't send synthetic redactions to clients because for this specific case we consider the clients to be able to destroy an event themselves, instead we just censor it (by pruning its JSON) in the database | ||||
* | | | | | | | write some docs for the quarantine_media api (#6458) | Richard van der Hoff | 2019-12-03 | 2 | -0/+18 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Add benchmarks for structured logging performance (#6266) | Amber Brown | 2019-12-03 | 7 | -0/+294 |
|/ / / / / | |||||
* | | | | | Transfer power level state events on room upgrade (#6237) | Andrew Morgan | 2019-12-02 | 2 | -5/+32 |
| | | | | | |||||
* | | | | | Use python3 packages for Ubuntu (#6443) | Andrew Morgan | 2019-12-02 | 2 | -2/+3 |
| | | | | | |||||
* | | | | | Fix: Pillow error when uploading RGBA image (#3325) (#6241) | Filip Štědronský | 2019-12-02 | 2 | -1/+5 |
| |_|/ / |/| | | | | | | | Signed-Off-By: Filip Štědronský <g@regnarg.cz> | ||||
* | | | | Add User-Interactive Auth to /account/3pid/add (#6119) | Andrew Morgan | 2019-11-29 | 2 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasons | Erik Johnston | 2019-11-29 | 7 | -10/+162 |
|\ \ \ \ | | | | | | | | | | | Implement MSC 2367 - Membership Reasons | ||||
| * | | | | Newsfile | Erik Johnston | 2019-11-28 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add tests | Erik Johnston | 2019-11-28 | 1 | -0/+140 |
| | | | | | |||||
| * | | | | Propagate reason in remotely rejected invites | Erik Johnston | 2019-11-28 | 4 | -9/+20 |
| | | | | | |||||
| * | | | | MSC2367 Allow reason field on all member events | Erik Johnston | 2019-11-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6436 from matrix-org/babolivier/fix-state-retrieval | Brendan Abolivier | 2019-11-29 | 3 | -9/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | Discard retention policies when retrieving state | ||||
| * | | | | | Lint | Brendan Abolivier | 2019-11-28 | 1 | -4/+8 |
| | | | | | | |||||
| * | | | | | Changelog | Brendan Abolivier | 2019-11-28 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-28 | 2 | -9/+15 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purge jobs don't delete the latest event in a room in order to keep the forward extremity and not break the room. On the other hand, get_state_events, when given an at_token argument calls filter_events_for_client to know if the user can see the event that matches that (sync) token. That function uses the retention policies of the events it's given to filter out those that are too old from a client's view. Some clients, such as Riot, when loading a room, request the list of members for the latest sync token it knows about, and get confused to the point of refusing to send any message if the server tells it that it can't get that information. This can happen very easily with the message retention feature turned on and a room with low activity so that the last event sent becomes too old according to the room's retention policy. An easy and clean fix for that issue is to discard the room's retention policies when retrieving state. | ||||
* | | | | | blacklist more tests | Richard van der Hoff | 2019-11-28 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-11-28 | 3 | -1/+22 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | 1.6.1 v1.6.1 github/release-v1.6.1 release-v1.6.1 | Andrew Morgan | 2019-11-28 | 5 | -3/+22 |
| | | | | |||||
| * | | | Remove local threepids on account deactivation (#6426) | Andrew Morgan | 2019-11-28 | 3 | -0/+17 |
| | | | | |||||
| * | | | Fix startup error when http proxy is defined. (#6421) | Richard van der Hoff | 2019-11-27 | 3 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | Guess I only tested this on python 2 :/ Fixes #6419. | ||||
* | | | | Remove local threepids on account deactivation (#6426) | Andrew Morgan | 2019-11-28 | 3 | -0/+17 |
| | | | | |||||
* | | | | Clarifications for the email configuration settings. (#6423) | Richard van der Hoff | 2019-11-28 | 3 | -2/+33 |
| | | | | | | | | | | | | Cf #6422 | ||||
* | | | | Implementation of MSC2314 (#6176) | Amber Brown | 2019-11-28 | 13 | -65/+174 |
| | | | | |||||
* | | | | add etag and count to key backup endpoints (#5858) | Hubert Chathi | 2019-11-27 | 7 | -124/+297 |
| | | | | |||||
* | | | | Add more tests to the worker blacklist (#6429) | Richard van der Hoff | 2019-11-27 | 2 | -0/+30 |
| | | | | |||||
* | | | | Merge pull request #6358 from matrix-org/babolivier/message_retention | Brendan Abolivier | 2019-11-27 | 13 | -8/+1055 |
|\ \ \ \ | | | | | | | | | | | Implement message retention policies (MSC1763) | ||||
| * \ \ \ | Merge branch 'develop' into babolivier/message_retention | Brendan Abolivier | 2019-11-26 | 138 | -1274/+2600 |
| |\ \ \ \ | |||||
| * | | | | | Don't restrict the tests to v1 rooms | Brendan Abolivier | 2019-11-26 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | Fix worker mode | Brendan Abolivier | 2019-11-19 | 1 | -56/+56 |
| | | | | | | |||||
| * | | | | | Fix 3PID invite exchange | Brendan Abolivier | 2019-11-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Lint again | Brendan Abolivier | 2019-11-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Lint again | Brendan Abolivier | 2019-11-19 | 2 | -11/+3 |
| | | | | | | |||||
| * | | | | | Lint | Brendan Abolivier | 2019-11-19 | 4 | -101/+77 |
| | | | | | | |||||
| * | | | | | Don't apply retention policy based filtering on state events | Brendan Abolivier | 2019-11-06 | 2 | -6/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy. | ||||
| * | | | | | Implement per-room message retention policies | Brendan Abolivier | 2019-11-04 | 13 | -6/+1074 |
| | | | | | | |||||
* | | | | | | clean up buildkite output | Richard van der Hoff | 2019-11-26 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Remove assertion and provide a clear warning on startup for missing ↵ | Andrew Morgan | 2019-11-26 | 4 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | public_baseurl (#6379) | ||||
* | | | | | | Merge pull request #6343 from matrix-org/rav/event_auth/4 | Richard van der Hoff | 2019-11-26 | 2 | -37/+45 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Refactor _update_auth_events_and_context_for_auth | ||||
| * | | | | | | remove confusing fixme | Richard van der Hoff | 2019-11-26 | 1 | -6/+0 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4 | Richard van der Hoff | 2019-11-18 | 30 | -47/+85 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | newsfile | Richard van der Hoff | 2019-11-08 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Use get_events_as_list rather than lots of calls to get_event | Richard van der Hoff | 2019-11-08 | 1 | -16/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's more efficient and clearer. | ||||
| * | | | | | | | Update some docstrings and comments | Richard van der Hoff | 2019-11-08 | 1 | -8/+31 |
| | | | | | | | | |||||
| * | | | | | | | Simplify _update_auth_events_and_context_for_auth | Richard van der Hoff | 2019-11-08 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move event_key calculation into _update_context_for_auth_events, since it's only used there. | ||||
* | | | | | | | | Fix startup error when http proxy is defined. (#6421) | Richard van der Hoff | 2019-11-26 | 3 | -4/+5 |
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Guess I only tested this on python 2 :/ Fixes #6419. | ||||
* | | | | | | | Merge pull request #6420 from ↵ | Erik Johnston | 2019-11-26 | 2 | -12/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/erikj/fix_find_next_generated_user_id_localpart Fix guest registration | ||||
| * | | | | | | | Don't construct a set | Erik Johnston | 2019-11-26 | 1 | -6/+3 |
| | | | | | | | | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-11-26 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix find_next_generated_user_id_localpart | Erik Johnston | 2019-11-26 | 1 | -10/+7 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-11-26 | 4 | -2/+17 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | 1.6.0 v1.6.0 github/release-v1.6.0 release-v1.6.0 | Andrew Morgan | 2019-11-26 | 4 | -2/+16 |
| | | | | | | | |||||
| * | | | | | | Fix phone home stats (#6418) | Erik Johnston | 2019-11-26 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix phone home stats | ||||
* | | | | | | | Prevent account_data content from being sent over TCP replication (#6333) | Andrew Morgan | 2019-11-26 | 3 | -7/+7 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-11-14 | 5 | -2/+6 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anoa/fix_account_data_sync * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5 | ||||
| * | | | | | | | | lint | Andrew Morgan | 2019-11-08 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add changelog | Andrew Morgan | 2019-11-08 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove content from being sent for account data rdata stream | Andrew Morgan | 2019-11-08 | 2 | -6/+6 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fix | Erik Johnston | 2019-11-26 | 4 | -4/+99 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Fix caching devices for remote servers in worker. | ||||
| * | | | | | | | Fixup docs | Erik Johnston | 2019-11-26 | 2 | -2/+6 |
| | | | | | | | | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-11-05 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix caching devices for remote servers in worker. | Erik Johnston | 2019-11-05 | 3 | -4/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `/keys/query` API is hit on client_reader worker Synapse may decide that it needs to resync some remote deivces. Usually this happens on master, and then gets cached. However, that fails on workers and so it falls back to fetching devices from remotes directly, which may in turn fail if the remote is down. | ||||
* | | | | | | | | Make sure that we close cursors before returning from a query (#6408) | Richard van der Hoff | 2019-11-25 | 3 | -10/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are lots of words in the comment as to why this is a good idea. Fixes #6403. | ||||
* | | | | | | | | Merge tag 'v1.6.0rc2' into develop | Richard van der Hoff | 2019-11-25 | 3 | -19/+35 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.6.0rc2 (2019-11-25) ============================= Bugfixes -------- - Fix a bug which could cause the background database update hander for event labels to get stuck in a loop raising exceptions. ([\#6407](https://github.com/matrix-org/synapse/issues/6407)) | ||||
| * | | | | | | | 1.6.0rc2 v1.6.0rc2 | Richard van der Hoff | 2019-11-25 | 3 | -2/+10 |
| | | | | | | | | |||||
| * | | | | | | | Fix exceptions from background database update for event labels. (#6407) | Richard van der Hoff | 2019-11-25 | 2 | -18/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some exception handling here so that events whose json cannot be parsed are ignored rather than getting us stuck in a loop. Fixes #6404. | ||||
* | | | | | | | | Improve the performance of structured logging (#6322) | Amber Brown | 2019-11-26 | 4 | -30/+93 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #6392 from matrix-org/babolivier/fix-1623 | Brendan Abolivier | 2019-11-25 | 2 | -0/+75 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Test if a purge can make /messages return 500 responses | ||||
| * | | | | | | | | Lint | Brendan Abolivier | 2019-11-20 | 1 | -6/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Changelog | Brendan Abolivier | 2019-11-20 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Test if a purge can make /messages return 500 responses | Brendan Abolivier | 2019-11-20 | 1 | -0/+72 |
| | | | | | | | | | |||||
* | | | | | | | | | Add working build command for docker image (#6390) | Andrew Morgan | 2019-11-23 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add working build command for docker image * Add changelog | ||||
* | | | | | | | | | Fix link to user_dir_populate.sql in the user directory docs (#6388) | Aaron Raimist | 2019-11-21 | 2 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Clean up newline quote marks around the codebase (#6362) | Andrew Morgan | 2019-11-21 | 26 | -46/+43 |
| | | | | | | | | | |||||
* | | | | | | | | | update macOS installation instructions | Matthew Hodgson | 2019-11-20 | 1 | -2/+10 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | 1.6.0rc1 v1.6.0rc1 | Andrew Morgan | 2019-11-20 | 62 | -61/+75 |
| | | | | | | | | |||||
* | | | | | | | | Docker: Change permissions for data dir before attempting to write to it (#6389) | Andrew Morgan | 2019-11-20 | 2 | -3/+4 |
| | | | | | | | | |||||
* | | | | | | | | Move admin endpoints into separate files (#6308) | Manuel Stahl | 2019-11-20 | 5 | -555/+622 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanups | Brendan Abolivier | 2019-11-20 | 3 | -70/+126 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Only do `rc_login` ratelimiting on succesful login. | ||||
| * | | | | | | | Lint | Brendan Abolivier | 2019-11-20 | 1 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | Apply suggestions from code review | Erik Johnston | 2019-11-18 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> | ||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-11-06 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Add failed auth ratelimiting to UIA | Erik Johnston | 2019-11-06 | 1 | -1/+32 |
| | | | | | | | | |||||
| * | | | | | | | Only do `rc_login` ratelimiting on succesful login. | Erik Johnston | 2019-11-06 | 2 | -72/+94 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing this in a number of places which meant that some login code paths incremented the counter multiple times. It was also applying ratelimiting to UIA endpoints, which was probably not intentional. In particular, some custom auth modules were calling `check_user_exists`, which incremented the counters, meaning that people would fail to login sometimes. | ||||
* | | | | | | | Replace UPDATE with UPSERT on device_max_stream_id table (#6363) | Andrew Morgan | 2019-11-15 | 2 | -2/+16 |
| | | | | | | | |||||
* | | | | | | | Add optional python dependencies to snap packaging (#6317) | James | 2019-11-14 | 2 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Hebden <james@ec0.io> | ||||
* | | | | | | | Fix guest -> real account upgrade with account validity enabled (#6359) | Andrew Morgan | 2019-11-14 | 2 | -6/+4 |
| | | | | | | | |||||
* | | | | | | | Replace instance variations of homeserver with correct case/spacing (#6357) | Andrew Morgan | 2019-11-14 | 21 | -37/+38 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-11-14 | 5 | -2/+6 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anoa/homeserver_copy * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5 | ||||
* | | | | | | | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 | Brendan Abolivier | 2019-11-14 | 3 | -2/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Set room version default to 5 | ||||
| * | | | | | | Set room version default to 5 | Neil Johnson | 2019-10-19 | 3 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | Blacklist PurgeRoomTestCase (#6361) | Andrew Morgan | 2019-11-13 | 2 | -0/+3 |
| |_|_|/ / / |/| | | | | | |||||
| | * | | | | sample config | Andrew Morgan | 2019-11-12 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Add changelog | Andrew Morgan | 2019-11-12 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | A couple more instances | Andrew Morgan | 2019-11-12 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Replace instance variations of homeserver with correct case/spacing | Andrew Morgan | 2019-11-12 | 18 | -31/+31 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #6340 from matrix-org/babolivier/pagination_query | Brendan Abolivier | 2019-11-08 | 2 | -8/+33 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix the SQL SELECT query in _paginate_room_events_txn | ||||
| * | | | | | Incorporate review | Brendan Abolivier | 2019-11-08 | 1 | -12/+12 |
| | | | | | | |||||
| * | | | | | Lint | Brendan Abolivier | 2019-11-07 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Only join on event_labels if we're filtering on labels | Brendan Abolivier | 2019-11-07 | 1 | -9/+24 |
| | | | | | | |||||
| * | | | | | Handle lack of filter | Brendan Abolivier | 2019-11-07 | 1 | -5/+3 |
| | | | | | | |||||
| * | | | | | Changelog | Brendan Abolivier | 2019-11-07 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fix the SQL SELECT query in _paginate_room_events_txn | Brendan Abolivier | 2019-11-07 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | Doing a SELECT DISTINCT when paginating is quite expensive, because it requires the engine to do sorting on the entire events table. However, we only need to run it if we're filtering on 2+ labels, so this PR is changing the request so that DISTINCT is only used then. | ||||
* | | | | | | Merge pull request #6295 from matrix-org/erikj/split_purge_history | Erik Johnston | 2019-11-08 | 8 | -182/+335 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Split purge API into events vs state and add PurgeEventsStorage | ||||
| * | | | | | | Move type annotation into docstring | Erik Johnston | 2019-11-08 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Fix deleting state groups during room purge. | Erik Johnston | 2019-11-06 | 2 | -14/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fix the tests to actually test that things got deleted. | ||||
| * | | | | | | Use correct type annotation | Erik Johnston | 2019-11-06 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-11-05 | 5 | -83/+146 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | erikj/split_purge_history | ||||
| * | | | | | | Change to not require a state_groups.room_id index. | Erik Johnston | 2019-11-04 | 4 | -53/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does mean that we won't clean up orphaned state groups (i.e. state groups that were persisted but the associated event wasn't). | ||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-11-04 | 96 | -369/+2050 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_purge_history | ||||
| * | | | | | | | Fix up comment | Erik Johnston | 2019-11-01 | 1 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | Update log line to lie a little less | Erik Johnston | 2019-10-31 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Add state_groups.room_id index | Erik Johnston | 2019-10-31 | 2 | -0/+24 |
| | | | | | | | | |||||
| * | | | | | | | Docstrings | Erik Johnston | 2019-10-31 | 1 | -3/+11 |
| | | | | | | | | |||||
| * | | | | | | | Fix purge room API | Erik Johnston | 2019-10-31 | 1 | -5/+8 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-31 | 94 | -282/+781 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_purge_history | ||||
| * | | | | | | | | Newsfile | Erik Johnston | 2019-10-30 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Split purge API into events vs state | Erik Johnston | 2019-10-30 | 6 | -184/+308 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-07 | 3 | -0/+81 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | MSC2326: Add background update to take previous events into account | ||||
| * | | | | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.py | Brendan Abolivier | 2019-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.py | Brendan Abolivier | 2019-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | | | | | | | Copy results | Brendan Abolivier | 2019-11-07 | 1 | -1/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Revert "Back to using cursor_to_dict" | Brendan Abolivier | 2019-11-07 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1186612d6cd728e6b7ed7806579db3cea7410b54. | ||||
| * | | | | | | | | | Back to using cursor_to_dict | Brendan Abolivier | 2019-11-07 | 1 | -9/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Initialise value before looping | Brendan Abolivier | 2019-11-07 | 1 | -4/+8 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Incorporate review | Brendan Abolivier | 2019-11-07 | 1 | -14/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix field name | Brendan Abolivier | 2019-11-06 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Update insert | Brendan Abolivier | 2019-11-06 | 1 | -1/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Update changelog | Brendan Abolivier | 2019-11-05 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-04 | 10 | -93/+256 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Print out the actual number of affected rows | Brendan Abolivier | 2019-11-04 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Correctly order results | Brendan Abolivier | 2019-11-04 | 1 | -5/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | TODO | Brendan Abolivier | 2019-11-04 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix exit condition | Brendan Abolivier | 2019-11-04 | 1 | -1/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Lint | Brendan Abolivier | 2019-11-04 | 1 | -6/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Changelog | Brendan Abolivier | 2019-11-04 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Don't try to process events we already have a label for | Brendan Abolivier | 2019-11-04 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Use a sensible default value for labels | Brendan Abolivier | 2019-11-04 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Use the right format for rows | Brendan Abolivier | 2019-11-04 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | MSC2326: Add background update to take previous events into account | Brendan Abolivier | 2019-11-04 | 2 | -0/+72 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Python 3.8 for tox (#6341) | Richard van der Hoff | 2019-11-07 | 3 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and update INSTALL.md to include py3.8. We'll also have to update the buildkite pipeline to run it | ||||
* | | | | | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups | Andrew Morgan | 2019-11-07 | 4 | -1/+30 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-11-04 | 5 | -83/+146 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | anoa/room_upgrade_groups | ||||
| * | | | | | | | | | Re-add docstring, with caveats detailed | Andrew Morgan | 2019-11-04 | 3 | -3/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Transfer upgraded rooms on groups | Andrew Morgan | 2019-11-04 | 3 | -0/+25 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | tweak changelog | Richard van der Hoff | 2019-11-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix LruCache callback deduplication (#6213) | V02460 | 2019-11-07 | 2 | -11/+38 |
| | | | | | | | | | |||||
* | | | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking ↵ | Andrew Morgan | 2019-11-06 | 4 | -21/+40 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6338) | ||||
| * | | | | | | | | | raise exception after multiple failures | Andrew Morgan | 2019-11-06 | 1 | -3/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Address review comments | Andrew Morgan | 2019-11-06 | 2 | -13/+13 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add changelog | Andrew Morgan | 2019-11-06 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Don't forget to ratelimit calls outside of RegistrationHandler | Andrew Morgan | 2019-11-06 | 2 | -2/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Numeric ID checker now checks @0, don't ratelimit on checking | Andrew Morgan | 2019-11-06 | 2 | -20/+29 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-11-06 | 6 | -3/+18 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'release-v1.5.1' | Richard van der Hoff | 2019-11-06 | 6 | -2/+73 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | build debs for eoan and bullseye github/release-v1.5.1 release-v1.5.1 | Richard van der Hoff | 2019-11-06 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | 1.5.1 v1.5.1 | Richard van der Hoff | 2019-11-06 | 5 | -3/+16 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ↵ | Richard van der Hoff | 2019-11-06 | 7 | -103/+285 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6320) Fixes a bug where rejected events were persisted with the wrong state group. Also fixes an occasional internal-server-error when receiving events over federation which are rejected and (possibly because they are backwards-extremities) have no prev_group. Fixes #6289. | ||||
* | | | | | | | | | | Add some checks that we aren't using state from rejected events (#6330) | Richard van der Hoff | 2019-11-05 | 3 | -6/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Raise an exception if accessing state for rejected events Add some sanity checks on accessing state_group etc for rejected events. * Skip calculating push actions for rejected events It didn't actually cause any bugs, because rejected events get filtered out at various later points, but there's not point in trying to calculate the push actions for a rejected event. | ||||
* | | | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_stats | Erik Johnston | 2019-11-05 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix phone home stats | ||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-11-05 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix phone home stats | Erik Johnston | 2019-11-05 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2 | Richard van der Hoff | 2019-11-05 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | Fix exception when OpenGraph tag values are ints | ||||
| * | | | | | | | | | Fix exception when OpenGraph tag values are ints | Richard van der Hoff | 2019-11-05 | 2 | -1/+3 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #6331 from matrix-org/rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 3 | -1/+55 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Strip overlong OpenGraph data from url preview | ||||
| * | | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 231 | -1824/+4529 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | |||||
* | | | / / / / / | Improve documentation for EventContext fields (#6319) | Richard van der Hoff | 2019-11-05 | 3 | -26/+69 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | Remove the psutil dependency (#6318) | Amber Brown | 2019-11-05 | 5 | -83/+146 |
| |_|/ / / / / |/| | | | | | | | | | | | | | * remove psutil and replace with resource | ||||
* | | | | | | | document the REPLICATE command a bit better (#6305) | Richard van der Hoff | 2019-11-04 | 5 | -10/+110 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | since I found myself wonder how it works |