summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* add changelogHubert Chathi2019-10-241-0/+1
|
* make notification of signatures work with workersHubert Chathi2019-10-243-2/+17
|
* Merge pull request #6248 from matrix-org/erikj/move_schema_filesErik Johnston2019-10-243-0/+1
|\ | | | | Move schema delta files to the correct data store.
| * NewsfileErik Johnston2019-10-241-0/+1
| |
| * Move schema delta files to the correct data store.Erik Johnston2019-10-242-0/+0
| | | | | | | | They were put in the global schema delta directory due to a bad merge.
* | Merge pull request #6247 from matrix-org/babolivier/port_db_columnBrendan Abolivier2019-10-242-0/+2
|\ \ | |/ |/| Add new boolean column to synapse_port_db
| * ChangelogBrendan Abolivier2019-10-241-0/+1
| |
| * Add new boolean column to synapse_port_dbBrendan Abolivier2019-10-241-0/+1
| |
* | Fix up changelog v1.5.0rc1Andrew Morgan2019-10-242-22/+27
| |
* | 1.5.0rc1Andrew Morgan2019-10-2463-65/+80
|/
* Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-248-47/+161
| | | | The expected use case is to suppress MAU limiting on small instances
* Cleanup extra quotes from IDEs (#6236)Andrew Morgan2019-10-234-5/+5
|
* Merge pull request #6243 from matrix-org/babolivier/port_db_fix_importsBrendan Abolivier2019-10-232-11/+20
|\ | | | | Fix import paths in synapse_port_db
| * ChangelogBrendan Abolivier2019-10-231-0/+1
| |
| * Fix import paths in synapse_port_dbBrendan Abolivier2019-10-231-11/+19
|/
* Make synapse_port_db correctly create indexes (#6102)Brendan Abolivier2019-10-232-52/+131
| | | | | | | Make `synapse_port_db` correctly create indexes in the PostgreSQL database, by having it run the background updates on the database before migrating the data. To ensure we're migrating the right data, also block the port if the SQLite3 database still has pending or ongoing background updates. Fixes #4877
* Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-2314-30/+49
| | | | | Add a linting script that enforces all boolean values in the default config be lowercase. This has annoyed me for a while so I decided to fix it.
* Merge pull request #6231 from matrix-org/erikj/refactor_storesErik Johnston2019-10-23269-4395/+4649
|\ | | | | Refactor storage layer to support multiple databases
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-228-19/+783
| |\ | |/ |/| | | erikj/refactor_stores
* | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Hubert Chathi2019-10-225-14/+774
|\ \ | | | | | | Cross-signing [3/4] -- uploading signatures edition
| * | Add changelog entryHubert Chathi2019-10-181-0/+1
| | | | | | | | | | | | ... again? How did you make it disappear, git?
| * | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-18354-5244/+9522
| |\ \
| * | | fix doc stringsHubert Chathi2019-10-181-9/+13
| | | |
| * | | make isort happyHubert Chathi2019-09-241-1/+0
| | | |
| * | | add some commentsHubert Chathi2019-09-241-2/+10
| | | |
| * | | drop some logger lines to debugHubert Chathi2019-09-241-3/+3
| | | |
| * | | make changes based on PR feedbackHubert Chathi2019-09-242-118/+165
| | | |
| * | | add function docsHubert Chathi2019-09-071-2/+24
| | | |
| * | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_sig_uploadHubert Chathi2019-09-070-0/+0
| |\ \ \
| * \ \ \ Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-0761-583/+1486
| |\ \ \ \
| * | | | | use something that's the right type for user_idHubert Chathi2019-09-061-1/+1
| | | | | |
| * | | | | run blackHubert Chathi2019-09-061-24/+10
| | | | | |
| * | | | | split out signature processing into separate functionsHubert Chathi2019-09-061-195/+204
| | | | | |
| * | | | | avoid modifying input parameterHubert Chathi2019-09-051-7/+7
| | | | | |
| * | | | | fix testHubert Chathi2019-09-051-1/+3
| | | | | |
| * | | | | update with newer coding styleHubert Chathi2019-09-042-3/+3
| | | | | |
| * | | | | add testHubert Chathi2019-09-041-0/+88
| | | | | |
| * | | | | make isort happyHubert Chathi2019-09-041-0/+1
| | | | | |
| * | | | | make black happyHubert Chathi2019-09-044-178/+141
| | | | | |
| * | | | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-044-85/+378
| | | | | |
| * | | | | implement device signature uploading/fetchingHubert Chathi2019-09-043-0/+338
| | | | | |
* | | | | | Fix demo script on ipv6-supported boxes (#6229)Andrew Morgan2019-10-222-2/+2
| | | | | | | | | | | | | | | | | | The synapse demo was a bit flakey in terms of supporting federation. It turns out that if your computer resolved `localhost` to `::1` instead of `127.0.0.1`, the built-in federation blacklist specified in `start.sh` would still block it, since it contained an entry for `::/127`. Removing this no longer prevents Synapse from contacting `::1`, federation works again on these boxes.
* | | | | | Update postgres.md (#6234)Adrien Luxey2019-10-221-3/+7
| | | | | | | | | | | | | | | | | | Added database owner authentication with `sudo` when `su` does not work
| | | | | * Clean up prepare_database.py a bit and add commentsErik Johnston2019-10-221-7/+30
| | | | | |
| | | | | * Delete background_update table creation in main data_storeErik Johnston2019-10-221-21/+0
| | | | | |
| | | | | * Move README into synapse/storage/__init__.pyErik Johnston2019-10-222-13/+12
| | | | | |
| | | | | * Add a basic README to synapse.storageErik Johnston2019-10-222-0/+14
| | | | | |
| | | | | * Fix postgres unit tests to use prepare_databaseErik Johnston2019-10-221-10/+2
| | | | | |
| | | | | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-2229-304/+707
| | | | | |\ | |_|_|_|_|/ |/| | | | | | | | | | | erikj/refactor_stores
* | | | | | Delete format_tap.py (#6219)Andrew Morgan2019-10-192-48/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Delete format_tap.py This python implementation of a tap formatting library for buildkite has been replaced with a perl implementation as part of the matrix-org/sytest repo, which is specific to sytest's language, not that of any one homeserver's.
* | | | | | Remove Auth.check method (#6217)Richard van der Hoff2019-10-183-21/+6
| |_|_|/ / |/| | | | | | | | | This method was somewhat redundant, and confusing.
* | | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-1815-21/+693
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-18346-5021/+9505
| |\ \ \ \ \
| * | | | | | add note about database upgradeHubert Chathi2019-10-181-1/+4
| | | | | | |
| * | | | | | use the right function for when we're already in runInteractionHubert Chathi2019-10-181-4/+4
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-0761-583/+1486
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1Hubert Chathi2019-09-04141-1713/+2808
| |\ \ \ \ \ | | | |_|/ / | | |/| | | Cross-signing [2/4] - upload/download keys
| | * | | | add user signature stream change cache to slaved device storeHubert Chathi2019-09-041-0/+3
| | | | | |
| | * | | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-04132-1703/+2168
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-28207-1510/+4979
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-08-28206-1438/+4695
| |\ \ \ \ \ \
| * | | | | | | Cross-signing [1/4] -- hidden devices (#5759)Hubert Chathi2019-08-124-10/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | | * | | | | blackHubert Chathi2019-08-281-3/+1
| | | | | | | |
| | | * | | | | use stream ID generator instead of timestampHubert Chathi2019-08-284-23/+23
| | | | | | | |
| | | * | | | | make isort happyHubert Chathi2019-08-211-1/+0
| | | | | | | |
| | | * | | | | apply PR review suggestionsHubert Chathi2019-08-214-53/+46
| | | | | | | |
| | | * | | | | fix formattingHubert Chathi2019-08-012-2/+4
| | | | | | | |
| | | * | | | | add changelogHubert Chathi2019-08-011-0/+1
| | | | | | | |
| | | * | | | | make changes from PR reviewHubert Chathi2019-08-014-49/+75
| | | | | | | |
| | | * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-01298-2145/+3414
| | | |\ \ \ \ \
| | | | * | | | | don't need to return the hidden column any moreHubert Chathi2019-08-011-1/+1
| | | | | | | | |
| | | | * | | | | really fix queries to work with PostgresHubert Chathi2019-07-311-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (by going back to not using SQL directly)
| | | | * | | | | PostgreSQL, Y U no like?Hubert Chathi2019-07-311-3/+4
| | | | | | | | |
| | | | * | | | | remove extra SQL query paramHubert Chathi2019-07-311-1/+0
| | | | | | | | |
| | | | * | | | | Merge branch 'develop' into cross-signing_hiddenHubert Chathi2019-07-30298-2125/+3402
| | | | |\ \ \ \ \
| | | * | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-07-304-21/+18
| | | |\| | | | | |
| | | | * | | | | | add changelog fileHubert Chathi2019-07-301-0/+1
| | | | | | | | | |
| | | | * | | | | | apply changes from PR reviewHubert Chathi2019-07-303-20/+17
| | | | | | | | | |
| | | * | | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-2511-12/+621
| | | |/ / / / / /
| | | * | | | | | allow devices to be marked as "hidden"Hubert Chathi2019-07-242-16/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #6214 from matrix-org/rav/event_auth/1Richard van der Hoff2019-10-186-211/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove a bunch of dead event_auth code.
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-1821-152/+212
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix logging config for the docker image (#6197)Richard van der Hoff2019-10-183-3/+5
| |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that loggers that are instantiated before the config is loaded get turned off. Also bring the logging config that is generated by --generate-config into line. Fixes #6194.
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-1846-223/+460
| |\ \ \ \ \ \ \ \
| * | | | | | | | | changelogRichard van der Hoff2019-10-171-0/+1
| | | | | | | | | |
| * | | | | | | | | rip out some unreachable codeRichard van der Hoff2019-10-174-153/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only possible rejection reason is AUTH_ERROR, so all of this is unreachable.
| * | | | | | | | | Remove dead check_auth scriptRichard van der Hoff2019-10-111-58/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't work, and afaict hasn't been used since 2015.
| | | | | | | | | * Fix packagingErik Johnston2019-10-211-5/+5
| | | | | | | | | |
| | | | | | | | | * NewsfileErik Johnston2019-10-211-0/+1
| | | | | | | | | |
| | | | | | | | | * Fix schema management to work with multiple data stores.Erik Johnston2019-10-211-41/+108
| | | | | | | | | |
| | | | | | | | | * Move storage classes into a main "data store".Erik Johnston2019-10-21266-4331/+4509
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for having multiple data stores that offer different functionality, e.g. splitting out state or event storage.
* | | | | | | | | Merge branch 'master' into developBrendan Abolivier2019-10-185-30/+40
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge tag 'v1.4.1'Brendan Abolivier2019-10-186-5/+91
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.4.1 (2019-10-18) ========================== No changes since 1.4.1rc1. Synapse 1.4.1rc1 (2019-10-17) ============================= Bugfixes -------- - Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](https://github.com/matrix-org/synapse/issues/6185), [5b0e9948](https://github.com/matrix-org/synapse/commit/5b0e9948eaae801643e594b5abc8ee4b10bd194e))
| | * | | | | | | | | Fix changelog v1.4.1 github/release-v1.4.1 release-v1.4.1Brendan Abolivier2019-10-181-1/+1
| | | | | | | | | | |
| | * | | | | | | | | 1.4.1Brendan Abolivier2019-10-183-1/+13
| | | | | | | | | | |
| * | | | | | | | | | Update docker-compose.yml for a static config file, and update traefik ↵przemas752019-10-182-29/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples (#6142)
* | | | | | | | | | | Merge pull request #6196 from matrix-org/erikj/awaitErik Johnston2019-10-187-114/+114
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move rest/admin to use async/await.
| * | | | | | | | | | | Port synapse/rest/client/_base.py to async/awaitErik Johnston2019-10-111-9/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Add maybe_awaitable and fix __init__ bugsErik Johnston2019-10-112-2/+34
| | | | | | | | | | | |
| * | | | | | | | | | | NewsfileErik Johnston2019-10-111-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Port synaps/rest/client/users.py to async/awaitErik Johnston2019-10-111-11/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Port synaps/rest/client/server_notice_servlet.py to async/awaitErik Johnston2019-10-111-6/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Port synaps/rest/client/media.py to async/awaitErik Johnston2019-10-111-16/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Port rest/admin/__init__.py to async/awaitErik Johnston2019-10-111-72/+55
| | | | | | | | | | | |
* | | | | | | | | | | | Add missing BOOLEAN_COLUMNs to synapse_port_db (#6216)Bart Noordervliet2019-10-182-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small fix to synapse_port_db to be able to convert from database schema v56.
* | | | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-184-5/+50
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix presence timeouts when synchrotron restarts. Handling timeouts would fail if there was an external process that had timed out, e.g. a synchrotron restarting. This was due to a couple of variable name typoes. Fixes #3715.
* | | | | | | | | | | Remove dead changelog fileRichard van der Hoff2019-10-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of 1.4.1
* | | | | | | | | | | Fix up changelogsRichard van der Hoff2019-10-171-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge tag 'v1.4.1rc1' into developRichard van der Hoff2019-10-172-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.4.1rc1 (2019-10-17) ============================= Bugfixes -------- - Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](https://github.com/matrix-org/synapse/issues/6185), [5b0e9948](https://github.com/matrix-org/synapse/commit/5b0e9948eaae801643e594b5abc8ee4b10bd194e))
| * | | | | | | | | | 1.4.1rc1 v1.4.1rc1Richard van der Hoff2019-10-173-2/+9
| | | | | | | | | | |
| * | | | | | | | | | Do the update as a background indexErik Johnston2019-10-172-9/+51
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsErik Johnston2019-10-173-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inserting bytes as text in `censor_redactions`
* | | | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-114-18/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | make storage layer in charge of interpreting the device key data
| * | | | | | | | | | | expand on commentHubert Chathi2019-10-111-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | make sure we actually return somethingHubert Chathi2019-10-102-2/+9
| | | | | | | | | | | |
| * | | | | | | | | | | add changelogHubert Chathi2019-10-101-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-103-19/+15
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-114-19/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | make version optional in body of e2e backup version update
| * | | | | | | | | | | | change test name to be uniqueHubert Chathi2019-10-101-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | add changelogHubert Chathi2019-10-091-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-093-19/+34
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to agree with latest version of the MSC
* | | | | | | | | | | | Merge pull request #6195 from matrix-org/erikj/opentracing_preview_urlErik Johnston2019-10-113-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | Trace non-JSON APIs, /media, /key etc
| * | | | | | | | | | | NewsfileErik Johnston2019-10-111-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Trace non-JSON APIs, /media, /key etcErik Johnston2019-10-112-5/+11
| | | | | | | | | | | |
* | | | | | | | | | | | cas: support setting display name (#6114)Valérian Rousset2019-10-114-1/+8
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly.
* | | | | | | | | | | Fix MAU reaping where reserved users are specified. (#6168)Neil Johnson2019-10-114-51/+115
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #6156 from matrix-org/erikj/postgres_anyErik Johnston2019-10-1015-109/+190
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Postgres ANY for selecting many values.
| * | | | | | | | | | | Fix SQLite take 2Erik Johnston2019-10-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix SQLiteErik Johnston2019-10-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Remove add_in_list_sql_clauseErik Johnston2019-10-104-34/+25
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_anyErik Johnston2019-10-108-102/+236
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | NewsfileErik Johnston2019-10-101-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Replace IN usage with helper funcsErik Johnston2019-10-1011-97/+138
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add helper funcs to use postgres ANYErik Johnston2019-10-101-8/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that we can write queries with `col = ANY(?)`, which helps postgres.
* | | | | | | | | | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytesErik Johnston2019-10-108-15/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | Disable bytes usage with postgres
| * | | | | | | | | | | | Fix postgres unit testsErik Johnston2019-10-101-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix store_url_cache using bytesErik Johnston2019-10-101-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-108-102/+236
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | erikj/disable_sql_bytes
* | | | | | | | | | | | | Merge pull request #6191 from matrix-org/rav/fix_packagingErik Johnston2019-10-102-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | Fix python packaging
| * | | | | | | | | | | | Fix python packagingRichard van der Hoff2019-10-102-3/+2
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... after it got borked by #6081
* | | | | | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerErik Johnston2019-10-106-99/+234
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Add more log context checks when patching inlineCallbacks
| * | | | | | | | | | | Fixup commentsErik Johnston2019-10-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| * | | | | | | | | | | Fix py3.5Erik Johnston2019-10-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix py3.5Erik Johnston2019-10-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | sortErik Johnston2019-10-101-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Appease mypyErik Johnston2019-10-101-13/+18
| | | | | | | | | | | |
| * | | | | | | | | | | Add comentsErik Johnston2019-10-101-5/+25
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-1048-163/+556
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | NewsfileErik Johnston2019-10-101-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix packagingErik Johnston2019-10-101-2/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Log correct contextErik Johnston2019-10-101-6/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Test for sentinel commitErik Johnston2019-10-101-2/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move patch_inline_callbacks into synapse/Erik Johnston2019-10-103-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-0999-1106/+1795
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | UpdateErik Johnston2019-09-271-8/+15
| | | | | | | | | | | | |
| * | | | | | | | | | | | Patch inlinecallbacks for log contextsErik Johnston2019-09-275-10/+95
| | | | | | | | | | | | |
| | | | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-10135-1692/+2474
| | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | erikj/disable_sql_bytes
* | | | | | | | | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-103-1/+13
| | | | | | | | | | | | |
* | | | | | | | | | | | | before fulfilling a group invite,check if user is already joined/invited (#3436)Michael Telatynski2019-10-102-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes vector-im/riot-web#5645
* | | | | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-104-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed the weirdness of 400 vs 404 as http status code in the case the filter id is not known by the server. As e.g. matrix-js-sdk expects 404 to catch this situation this leads to unwanted behaviour.
* | | | | | | | | | | | | Add snapcraft packaging information (#6084)James2019-10-103-0/+24
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-107-25/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this will fix the occasional failures we were seeing in the room directory. The problem was that events are not necessarily persisted (and `current_state_delta_stream` updated) in the same order as their stream_id. So for instance current_state_delta 9 might be persisted *before* current_state_delta 8. Then, when the room stats saw stream_id 9, it assumed it had done everything up to 9, and never came back to do stream_id 8. We can solve this easily by only processing up to the stream_id where we know all events have been persisted.
* | | | | | | | | | | | Rewrite the user_filter migration again (#6184)Richard van der Hoff2019-10-102-26/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | you can't plausibly ALTER TABLE in sqlite, so we create the new table with the right schema to start with.
* | | | | | | | | | | | Move tag/push rules room upgrade checking ealier (#6155)Andrew Morgan2019-10-102-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that _local_membership_update doesn't run when you join a new, remote room. It only runs if you're joining a room that your server already knows about. This would explain #4703 and #5295 and why the transfer would work in testing and some rooms, but not others. This would especially hit single-user homeservers. The check has been moved to right after the room has been joined, and works much more reliably. (Though it may still be a bit awkward of a place).
* | | | | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-1037-94/+415
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsErik Johnston2019-10-093-4/+29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix inserting bytes as text in `censor_redactions`
| * | | | | | | | | | | Update changelog.d/6185.bugfixErik Johnston2019-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
* | | | | | | | | | | | Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updatesBrendan Abolivier2019-10-0910-605/+671
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out backgroung updates
| * | | | | | | | | | | | Fix RegistrationStoreBrendan Abolivier2019-10-081-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Cleanup client_ipsBrendan Abolivier2019-10-081-7/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Don't end up with 4 classes in registrationBrendan Abolivier2019-10-081-52/+50
| | | | | | | | | | | | |
| * | | | | | | | | | | | ChangelogBrendan Abolivier2019-10-071-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | LintBrendan Abolivier2019-10-073-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move roommember's bg updates to a dedicated storeBrendan Abolivier2019-10-071-108/+114
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move user_directory's bg updates to a dedicated storeBrendan Abolivier2019-10-071-84/+94
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move state's bg updates to a dedicated storeBrendan Abolivier2019-10-071-190/+204
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move search's bg updates to a dedicated storeBrendan Abolivier2019-10-071-25/+31
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move registration's bg updates to a dedicated storeBrendan Abolivier2019-10-071-95/+103
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move media_repository's bg updates to a dedicated storeBrendan Abolivier2019-10-071-3/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move devices's bg updates to a dedicated storeBrendan Abolivier2019-10-071-22/+27
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move deviceinbox's bg updates to a dedicated storeBrendan Abolivier2019-10-071-15/+22
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move client_ips's bg updates to a dedicated storeBrendan Abolivier2019-10-071-94/+106
| | | | | | | | | | | | |
* | | | | | | | | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Anshul Angaria2019-10-082-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6109
* | | | | | | | | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2019-10-082-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unused public room list timeout param * Add changelog
* | | | | | | | | | | | | Fix /federation/v1/state for recent room versions (#6170)Richard van der Hoff2019-10-082-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix /federation/v1/state for recent room versions Turns out this endpoint was completely broken for v3 rooms. Hopefully this re-signing code is irrelevant nowadays anyway.
* | | | | | | | | | | | | fix changelogRichard van der Hoff2019-10-071-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failureErik Johnston2019-10-072-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't regenerate numeric user ID if registration fails.
| * | | | | | | | | | | | | Fixup newsfileErik Johnston2019-10-032-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove unused variableErik Johnston2019-10-031-2/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | NewsfileErik Johnston2019-10-031-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't regenerate numeric user ID if registration fails.Erik Johnston2019-10-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes huge amounts of DB IO if registrations start to fail e.g. because the DB is struggling with IO.
* | | | | | | | | | | | | | Log responder we are using. (#6139)Michael Kaye2019-10-072-1/+2
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | This prevents us logging "Responding to media request with responder %s".
* | | | | | | | | | | | | Fix changelog for PR #6175Brendan Abolivier2019-10-072-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky ↵Richard van der Hoff2019-10-073-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test (#6167)
* | | | | | | | | | | | | Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_indexBrendan Abolivier2019-10-072-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unique_user_filter_index schema update
| * | | | | | | | | | | | | ChangelogBrendan Abolivier2019-10-071-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix unique_user_filter_index schema updateBrendan Abolivier2019-10-071-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #6159 from matrix-org/erikj/cache_membershipsErik Johnston2019-10-072-19/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Cache room membership lookups in _get_joined_users_from_context
| * | | | | | | | | | | | | Fix bug where we didn't pull out event IDErik Johnston2019-10-071-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-035-19/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/cache_memberships
| * | | | | | | | | | | | | | Use the right error....Erik Johnston2019-10-031-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | pep8Erik Johnston2019-10-031-1/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixup names and commentsErik Johnston2019-10-031-6/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | cachedList descriptor doesn't like typingErik Johnston2019-10-031-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | NewsfileErik Johnston2019-10-031-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Cache room membership lookups in _get_joined_users_from_contextErik Johnston2019-10-031-19/+45
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-043-2/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't 500 when trying to exchange a revoked 3PID invite
| * | | | | | | | | | | | | | TypoBrendan Abolivier2019-10-041-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | LintBrendan Abolivier2019-10-041-3/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Lint (again)Brendan Abolivier2019-10-031-3/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | LintBrendan Abolivier2019-10-031-5/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add test caseBrendan Abolivier2019-10-032-1/+84
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-10-021-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | LintBrendan Abolivier2019-10-021-1/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-021-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this is not documented in the spec (but should be), Riot (and other clients) revoke 3PID invites by sending a m.room.third_party_invite event with an empty ({}) content to the room's state. When the invited 3PID gets associated with a MXID, the identity server (which doesn't know about revocations) sends down to the MXID's homeserver all of the undelivered invites it has for this 3PID. The homeserver then tries to talk to the inviting homeserver in order to exchange these invite for m.room.member events. When one of the invite is revoked, the inviting homeserver responds with a 500 error because it tries to extract a 'display_name' property from the content, which is empty. This might cause the invited server to consider that the server is down and not try to exchange other, valid invites (or at least delay it). This fix handles the case of revoked invites by avoiding trying to fetch a 'display_name' from the original invite's content, and letting the m.room.member event fail the auth rules (because, since the original invite's content is empty, it doesn't have public keys), which results in sending a 403 with the correct error message to the invited server.
* | | | | | | | | | | | | | | Update `user_filters` table to have a unique index, and non-null columns (#1172)Alexander Maznev2019-10-042-0/+47
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Robert Swain2019-10-042-3/+12
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pillow will use nearest neighbour as the resampling algorithm if the source image is either 1-bit or a color palette using 8 bits. If we convert to RGB before scaling, we'll probably get a better result.
* | | | | | | | | | | | | | add some metrics on the federation sender (#6160)Richard van der Hoff2019-10-035-19/+44
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into developAndrew Morgan2019-10-039-8/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6154 from matrix-org/erikj/fix_appservice_paginationErik Johnston2019-10-022-18/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix appservice room list pagination
| * | | | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix appservice room list paginationErik Johnston2019-10-021-18/+18
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatableErik Johnston2019-10-022-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix not showing non-federatable rooms to remote room list queries
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-10-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/fix_room_list_non_federatable
| * | | | | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix not showing non-federatable rooms to remote room list queriesErik Johnston2019-10-021-0/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #6148 from matrix-org/erikj/find_next_generatedErik Johnston2019-10-022-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Bound find_next_generated_user_id DB query.
| * | | | | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bound find_next_generated_user_id DB query.Erik Johnston2019-10-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can easily bound the set of user IDs we pull out of the DB, so lets do that.
* | | | | | | | | | | | | | | Merge pull request #6152 from matrix-org/erikj/fix_room_listErik Johnston2019-10-023-27/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | Fix public room list pagination.
| * | | | | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix public room list pagination.Erik Johnston2019-10-022-27/+59
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We incorrectly used `room_id` as to bound the result set, even though we order by `joined_members, room_id`, leading to incorrect results after pagination.
* | | | | | | | | | | | | | Merge branch 'master' into developBrendan Abolivier2019-10-024-9/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-027-350/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use room_stats and room_state for room directory search
* | | | | | | | | | | | | | | Fix up some typechecking (#6150)Amber Brown2019-10-0222-40/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * type checking fixes * changelog
* | | | | | | | | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2019-10-023-12/+9
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy push rules during a room upgrade from the old room to the new room, instead of deleting them from the old room. For instance, we've defined upgrading of a room multiple times to be possible, and push rules won't be transferred on the second upgrade if they're deleted during the first. Also fix some missing yields that probably broke things quite a bit.
* | | | | | | | | | | | | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-0211-19/+193
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'erikj/fixup_devices_last_seen_query' of ↵Erik Johnston2019-10-018-11/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into develop
* | | | | | | | | | | | | | | Drop unused tables (#6115)Richard van der Hoff2019-09-302-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tables are unused since #5893 (as amended by #6047), so we can now drop them. Fixes #6048.
* | | | | | | | | | | | | | | Edit SimpleHttpClient to reference that header keys can be passed as str or ↵Andrew Morgan2019-09-272-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bytes (#6077)
* | | | | | | | | | | | | | | Merge pull request #6125 from matrix-org/babolivier/deactivation-inviteBrendan Abolivier2019-09-273-14/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | Reject pending invites on deactivation
| * | | | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | | | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | | | | | | | | | | | | Update changelog.d/6125.featureBrendan Abolivier2019-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * | | | | | | | | | | | | | okBrendan Abolivier2019-09-271-1/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | LintBrendan Abolivier2019-09-272-10/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | ChangelogBrendan Abolivier2019-09-271-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add test to validate the changeBrendan Abolivier2019-09-271-13/+57
| | | | | | | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-02 20:28:09 +0000