summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Use the JSON encoder without whitespace in more places. (#8124)Patrick Cloke2020-08-209-27/+21
* Add more types to synapse.storage.database. (#8127)Patrick Cloke2020-08-203-222/+367
* Ensure a group ID is valid before trying to get rooms for it. (#8129)Patrick Cloke2020-08-202-0/+5
* Do not assume calls to runInteraction return Deferreds. (#8133)Patrick Cloke2020-08-207-31/+41
* Close the database connection we create during startup (#8131)Richard van der Hoff2020-08-192-1/+11
* Remove `ChainedIdGenerator`. (#8123)Erik Johnston2020-08-197-95/+26
* Switch the JSON byte producer from a pull to a push producer. (#8116)Patrick Cloke2020-08-195-46/+53
* Updated docs: Added note about missing 308 redirect support. (#8120)Ryan Cole2020-08-192-0/+13
* Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-1920-62/+85
* Convert runWithConnection to async. (#8121)Patrick Cloke2020-08-193-15/+15
* Remove the unused inlineCallbacks code-paths in the caching code (#8119)Patrick Cloke2020-08-193-52/+15
* Separate `get_current_token` into two. (#8113)Erik Johnston2020-08-196-20/+47
* Convert events worker database to async/await. (#8071)Patrick Cloke2020-08-1812-97/+106
* Add a link to the matrix-synapse-rest-password-provider. (#8111)Patrick Cloke2020-08-182-0/+2
* Fix the return type of send_nonmember_events. (#8112)Patrick Cloke2020-08-183-5/+17
* Remove : from allowed client_secret chars (#8101)Andrew Morgan2020-08-184-6/+16
* Rename changelog from bugfix to misc.Patrick Cloke2020-08-181-0/+0
* Iteratively encode JSON responses to avoid blocking the reactor. (#8013)Patrick Cloke2020-08-185-13/+94
* Return the previous stream token if a non-member event is a duplicate. (#8093)Patrick Cloke2020-08-182-10/+16
* Add resources.consent conditional dependency back (#8107)Andrew Morgan2020-08-182-20/+1
* Convert some of the general database methods to async (#8100)Patrick Cloke2020-08-1713-59/+69
* Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-1715-290/+310
* Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-08-173-6/+11
|\
| * Changelog changes v1.19.0 github/release-v1.19.0 release-v1.19.0Olivier Wilkinson (reivilibre)2020-08-171-5/+4
| * 1.19.0Olivier Wilkinson (reivilibre)2020-08-173-4/+10
* | Convert stream database to async/await. (#8074)Patrick Cloke2020-08-1711-227/+224
* | Add a shadow-banned flag to users. (#8092)Patrick Cloke2020-08-1412-12/+83
* | Convert pusher databases to async/await. (#8075)Patrick Cloke2020-08-144-95/+90
* | Convert receipts and events databases to async/await. (#8076)Patrick Cloke2020-08-144-82/+80
* | Add type hints to synapse.handlers.room (#8090)Erik Johnston2020-08-143-39/+69
* | Remove some unused database functions. (#8085)Patrick Cloke2020-08-147-244/+19
* | Convert misc database code to async (#8087)Patrick Cloke2020-08-1411-64/+39
* | Remove a space at the start of a changelog entry.Patrick Cloke2020-08-131-1/+1
* | Merge tag 'v1.19.0rc1' into developOlivier Wilkinson (reivilibre)2020-08-1372-71/+70
|\|
| * More changelog tweaks v1.19.0rc1Olivier Wilkinson (reivilibre)2020-08-131-4/+4
| * More changelog tweaksOlivier Wilkinson (reivilibre)2020-08-131-4/+8
| * Remove unwanted changelog lineOlivier Wilkinson (reivilibre)2020-08-131-1/+0
| * 1.19.0rc1Olivier Wilkinson (reivilibre)2020-08-1372-71/+67
* | Run `remove_push_actions_from_staging` in foreground (#8081)Richard van der Hoff2020-08-132-3/+2
* | Drop federation transmission queues during a significant remote outage. (#7864)reivilibre2020-08-132-0/+23
* | Fix unawaited coroutine error in tests. (#8072)Patrick Cloke2020-08-132-10/+21
|/
* Convert the roommember database to async/await. (#8070)Patrick Cloke2020-08-125-242/+116
* Convert devices database to async/await. (#8069)Patrick Cloke2020-08-125-176/+220
* Add type hints to handlers.message and events.builder (#8067)Erik Johnston2020-08-127-41/+61
* Convert account data, device inbox, and censor events databases to async/awai...Patrick Cloke2020-08-125-87/+99
* Convert appservice, group server, profile and more databases to async (#8066)Patrick Cloke2020-08-129-116/+91
* Fix typing for notifier (#8064)Erik Johnston2020-08-126-16/+38
* Merge pull request #8060 from matrix-org/erikj/type_serverErik Johnston2020-08-118-403/+269
|\
| * Merge remote-tracking branch 'origin/develop' into erikj/type_serverErik Johnston2020-08-1119-117/+406
| |\
| * | Add comment explaining castErik Johnston2020-08-111-0/+2
| * | Handle optional dependencies for Oidc and SamlErik Johnston2020-08-111-5/+9
| * | NewsfileErik Johnston2020-08-111-0/+1
| * | Change HomeServer definition to work with typing.Erik Johnston2020-08-117-399/+264
* | | Convert tags and metrics databases to async/await (#8062)Patrick Cloke2020-08-114-65/+64
* | | Converts event_federation and registration databases to async/await (#8061)Patrick Cloke2020-08-117-177/+150
| |/ |/|
* | Auto set logging filter (#8051)Erik Johnston2020-08-114-21/+17
|\ \
| * | Update changelog.d/8051.miscErik Johnston2020-08-111-1/+1
| * | NewsfileErik Johnston2020-08-111-0/+1
| * | Move setting of Filter into code.Erik Johnston2020-08-113-21/+16
* | | Add typing info to Notifier (#8058)Erik Johnston2020-08-115-52/+91
|/ /
* | Reduce INFO logging (#8050)Erik Johnston2020-08-114-25/+74
* | Change the default log config to reduce disk I/O and storage (#8040)Erik Johnston2020-08-113-10/+73
* | Implement login blocking based on SAML attributes (#8052)Richard van der Hoff2020-08-116-11/+159
|/
* Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2020-08-102-4/+3
|\
| * Stop uploading -py3 docker images (#8056)Richard van der Hoff2020-08-102-4/+3
* | Add an assertion on prev_events in create_new_client_event (#8041)Richard van der Hoff2020-08-103-0/+14
* | Implement new experimental push rules (#7997)Brendan Abolivier2020-08-105-14/+245
|\ \
| * | TypoBrendan Abolivier2020-08-101-1/+1
| * | LintBrendan Abolivier2020-08-101-2/+2
| * | why mypy whyBrendan Abolivier2020-08-101-1/+3
| * | LintBrendan Abolivier2020-08-061-1/+1
| * | Incorporate reviewBrendan Abolivier2020-08-061-2/+2
| * | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-08-06399-1731/+2141
| |\ \
| * | | Incorporate reviewBrendan Abolivier2020-08-064-21/+12
| * | | Fix PUT /pushrules to use the right rule IDsBrendan Abolivier2020-08-031-2/+9
| * | | Back out the database hack and replace it with a temporary config settingBrendan Abolivier2020-08-034-48/+20
| * | | Fix cache nameBrendan Abolivier2020-07-311-1/+1
| * | | Fix cache invalidation callsBrendan Abolivier2020-07-312-2/+2
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-07-312-1/+22
| |\ \ \
| * | | | LintBrendan Abolivier2020-07-301-19/+32
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-07-30230-4052/+5355
| |\ \ \ \
| * | | | | ChangelogBrendan Abolivier2020-07-301-0/+1
| * | | | | Implement new experimental push rules with a database hack to enable themBrendan Abolivier2020-07-283-14/+259
* | | | | | Convert directory, e2e_room_keys, end_to_end_keys, monthly_active_users datab...Patrick Cloke2020-08-0710-120/+141
* | | | | | Convert additional database stores to async/await (#8045)Patrick Cloke2020-08-076-152/+107
* | | | | | Clarify that undoing a shutdown might not be possible (#8010)Travis Ralston2020-08-072-3/+11
* | | | | | Add a comment about SSLv23_METHOD (#8043)Richard van der Hoff2020-08-072-0/+9
* | | | | | Don't log OPTIONS request at INFO (#8049)Erik Johnston2020-08-072-1/+8
* | | | | | Remove unnecessary maybeDeferred calls (#8044)Patrick Cloke2020-08-075-7/+5
* | | | | | Add health check endpoint (#8048)Erik Johnston2020-08-077-3/+90
* | | | | | Reduce unnecessary whitespace in JSON. (#7372)David Vo2020-08-0715-53/+56
* | | | | | Revert #7736 (#8039)Brendan Abolivier2020-08-0612-339/+19
* | | | | | Convert some util functions to async (#8035)Patrick Cloke2020-08-064-61/+39
* | | | | | Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-0622-160/+172
* | | | | | Convert run_as_background_process inner function to async. (#8032)Patrick Cloke2020-08-064-26/+16
* | | | | | Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-066-74/+146
| |_|_|/ / |/| | | |
* | | | | Fixup worker doc (again) (#8000)Erik Johnston2020-08-063-14/+43
* | | | | Rename database classes to make some sense (#8033)Erik Johnston2020-08-05337-1323/+1408
* | | | | Stop the parent process flushing the logs on exit (#8012)Richard van der Hoff2020-08-054-3/+10
* | | | | bug report template: move comments into comment (#8030)Richard van der Hoff2020-08-051-2/+2
* | | | | Spruce up the check-newsfragment CI output (#8024)Andrew Morgan2020-08-042-1/+13
* | | | | Fix async/await calls for broken media providers. (#8027)Patrick Cloke2020-08-043-22/+21
* | | | | Convert the SimpleHttpClient to async. (#8016)Patrick Cloke2020-08-043-32/+26
* | | | | Convert streams to async. (#8014)Patrick Cloke2020-08-0410-30/+27
* | | | | re-implement daemonize (#8011)Richard van der Hoff2020-08-044-14/+135
* | | | | Remove signature check on v1 identity server lookups (#8001)Andrew Morgan2020-08-032-31/+4
* | | | | Prevent join->join membership transitions changing member count (#7977)Andrew Morgan2020-08-036-13/+126
* | | | | Implement handling of HTTP HEAD requests. (#7999)Patrick Cloke2020-08-033-8/+54
* | | | | Convert the crypto module to async/await. (#8003)Patrick Cloke2020-08-033-132/+109
* | | | | Allow guests to operate in encrypted rooms (#7314)Michael Albert2020-08-032-1/+2
* | | | | Convert replication code to async/await. (#7987)Patrick Cloke2020-08-0311-38/+29
* | | | | Convert ACME code to async/await. (#7989)Patrick Cloke2020-08-033-14/+11
* | | | | Fix some comments and types in service notices (#7996)Patrick Cloke2020-07-317-59/+56
* | | | | Merge pull request #8008 from matrix-org/erikj/add_rate_limiting_to_joinsErik Johnston2020-07-315-2/+73
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l...Erik Johnston2020-07-31121-1256/+1937
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Add docs for undoing room shutdowns (#7998)Travis Ralston2020-07-312-1/+22
| |_|/ / |/| | |
* | | | Update workers docs (#7990)Stuart Mumford2020-07-302-25/+35
* | | | Fix invite rejection when we have no forward-extremeties (#7980)Richard van der Hoff2020-07-302-8/+22
* | | | Fix typo in docs/workers.md (#7992)Erik Johnston2020-07-302-1/+2
* | | | Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-3017-236/+463
|\ \ \ \ | | |_|/ | |/| |
* | | | Convert federation client to async/await. (#7975)Patrick Cloke2020-07-3018-221/+209
* | | | Convert appservice to async. (#7973)Patrick Cloke2020-07-308-103/+122
* | | | Convert some of the data store to async. (#7976)Patrick Cloke2020-07-3010-207/+190
* | | | Ensure that remove_pusher is always async (#7981)Patrick Cloke2020-07-302-1/+2
* | | | Ensure the msg property of HttpResponseException is a string. (#7979)Patrick Cloke2020-07-293-7/+17
* | | | Remove from the event_relations table when purging historical events. (#7978)Patrick Cloke2020-07-292-0/+3
* | | | Add additional logging for SAML sessions. (#7971)Patrick Cloke2020-07-292-0/+4
* | | | Add MSC reference to changelog for #7736Brendan Abolivier2020-07-291-1/+1
* | | | Re-implement unread counts (#7736)Brendan Abolivier2020-07-2911-18/+339
* | | | Various improvements to the docs (#7899)Aaron Raimist2020-07-2910-100/+153
* | | | Convert storage layer to async/await. (#7963)Patrick Cloke2020-07-2810-185/+210
* | | | Add an option to disable purge in delete room admin API (#7964)Dirk Klimpel2020-07-284-7/+75
* | | | Move some log lines from default logger to sql/transaction loggers (#7952)Andrew Morgan2020-07-282-8/+11
* | | | Use the JSON module from the std library instead of simplejson. (#7936)Patrick Cloke2020-07-283-1/+14
* | | | Fix exit code for `check_line_terminators.sh` (#7970)Richard van der Hoff2020-07-282-1/+5
* | | | Option to allow server admins to join complex rooms (#7902)lugino-emeritus2020-07-285-2/+127
* | | | Merge tag 'v1.18.0rc2' into developRichard van der Hoff2020-07-286-88/+129
|\ \ \ \
* | | | | Fix typo in metrics docs (#7966)Erik Johnston2020-07-281-1/+1
* | | | | Add script for finding files with unix line terminators (#7965)Andrew Morgan2020-07-282-0/+32
* | | | | Convert the remaining media repo code to async / await. (#7947)Patrick Cloke2020-07-276-107/+131
* | | | | Convert a synapse.events to async/await. (#7949)Patrick Cloke2020-07-2713-82/+86
* | | | | Convert groups and visibility code to async / await. (#7951)Patrick Cloke2020-07-274-37/+31
* | | | | Convert push to async/await. (#7948)Patrick Cloke2020-07-2710-145/+106
| | | * | NewsfileErik Johnston2020-07-311-0/+1
| | | * | Add ratelimiting on joinsErik Johnston2020-07-314-2/+72
| | |/ /
| | * | Fix formatting of changelog and upgrade notes v1.18.0 github/release-v1.18.0 release-v1.18.0Olivier Wilkinson (reivilibre)2020-07-302-2/+1
| | * | Add deprecation warningsOlivier Wilkinson (reivilibre)2020-07-302-0/+36
| | * | 1.18.0Olivier Wilkinson (reivilibre)2020-07-304-2/+16
| | * | Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-2914-235/+413
| |/ /
| * | 1.18.0rc2 v1.18.0rc2Richard van der Hoff2020-07-285-4/+17
| * | Typing worker needs to handle stream update requests (#7967)Erik Johnston2020-07-282-1/+2
| * | Handle replication commands synchronously where possible (#7876)Richard van der Hoff2020-07-275-86/+113
|/ /
* | update changelog v1.18.0rc1Richard van der Hoff2020-07-271-16/+4
* | 1.18.0rc1Richard van der Hoff2020-07-2776-76/+106
* | Fix error reporting when using `opentracing.trace` (#7961)Erik Johnston2020-07-273-12/+4
* | Fix typing replication not being handled on master (#7959)Erik Johnston2020-07-274-7/+12
* | Remove hacky error handling for inlineDeferreds. (#7950)Patrick Cloke2020-07-273-21/+13
* | Convert tests/rest/admin/test_room.py to unix file endings (#7953)Andrew Morgan2020-07-272-1447/+1448
* | Support oEmbed for media previews. (#7920)Patrick Cloke2020-07-273-53/+355
* | Convert state resolution to async/await (#7942)Patrick Cloke2020-07-2418-184/+198
* | Fix up types and comments that refer to Deferreds. (#7945)Patrick Cloke2020-07-249-157/+174
* | Do not convert async functions to Deferreds in the interactive_auth_handler (...Patrick Cloke2020-07-242-26/+22
* | Convert more of the media code to async/await (#7873)Patrick Cloke2020-07-244-34/+47
* | Return an empty body for OPTIONS requests. (#7886)Patrick Cloke2020-07-243-25/+12
* | Downgrade warning on client disconnect to INFO (#7928)Richard van der Hoff2020-07-243-61/+3
* | Convert presence handler helpers to async/await. (#7939)Patrick Cloke2020-07-233-24/+24
* | Update the auth providers to be async. (#7935)Patrick Cloke2020-07-234-112/+118
* | Put a cache on `/state_ids` (#7931)Richard van der Hoff2020-07-232-2/+12
* | Abort federation requests if the client disconnects early (#7930)Richard van der Hoff2020-07-232-0/+7
* | Reorder database docs to promote postgresql. (#7933)Michael Kaye2020-07-232-5/+6
* | Convert the federation agent and related code to async/await. (#7874)Patrick Cloke2020-07-235-53/+51
* | Follow-up to admin API to re-activate accounts (#7908)Patrick Cloke2020-07-223-6/+43
* | Convert the message handler to async/await. (#7884)Patrick Cloke2020-07-2210-238/+273
* | Merge pull request #7934 from matrix-org/babolivier/acme_eolBrendan Abolivier2020-07-222-2/+4
|\ \ | |/ |/|
| * Update the dates for ACME v1 EOLBrendan Abolivier2020-07-222-2/+4
|/
* Skip serializing /sync response if client has disconnected (#7927)Richard van der Hoff2020-07-222-0/+7
* Add debugging to sync response generation (#7929)Richard van der Hoff2020-07-223-2/+19
* Remove an unused prometheus metric (#7878)Richard van der Hoff2020-07-222-3/+2
* Track command processing as a background process (#7879)Richard van der Hoff2020-07-224-3/+40
* Clean up PreserveLoggingContext (#7877)Richard van der Hoff2020-07-222-16/+14
* fix an incorrect commentRichard van der Hoff2020-07-221-2/+2
* Convert room list handler to async/await. (#7912)Patrick Cloke2020-07-213-41/+32
* Element CSS and logo in email templates (#7919)Jason Robinson2020-07-214-0/+12
* Lint the contrib/ directory in CI and linting scripts, add synctl to linting ...Andrew Morgan2020-07-2011-82/+71
* Remove unused code from synapse.logging.utils. (#7897)Karthikeyan Singaravelan2020-07-202-126/+2
* Fix a typo in the sample config. (#7890)Adrian2020-07-203-2/+3
* Fix deprecation warning: import ABC from collections.abc (#7892)Karthikeyan Singaravelan2020-07-205-6/+7
* Change sample config's postgres user to synapse_user (#7889)Andrew Morgan2020-07-203-2/+3
* Fix deprecation warning due to invalid escape sequences (#7895)Karthikeyan Singaravelan2020-07-202-4/+5
* Remove Ubuntu Eoan that is now EOL (#7888)Gary Kim2020-07-172-1/+1
* Fix the trace function for async functions. (#7872)Patrick Cloke2020-07-172-23/+41
* Add help for creating a user via docker (#7885)Michael Kaye2020-07-172-0/+16
* Switch to Debian:Slim from Alpine for the docker image (#7839)Christopher May-Townsend2020-07-173-40/+30
* Stop using 'device_max_stream_id' (#7882)Erik Johnston2020-07-174-5/+3
* Fix TypeError in synapse.notifier (#7880)Erik Johnston2020-07-172-0/+9
* Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-174-4/+18
* Change "unknown room ver" logging to warning. (#7881)Erik Johnston2020-07-172-1/+2
* Convert device handler to async/await (#7871)Patrick Cloke2020-07-176-166/+162
* Convert synapse.app to async/await. (#7868)Patrick Cloke2020-07-174-41/+37
* Convert _base, profile, and _receipts handlers to async/await (#7860)Patrick Cloke2020-07-176-59/+53
* Add admin endpoint to get members in a room. (#7842)Michael Albert2020-07-165-1/+107
* Consistently use `db_to_json` to convert from database values to JSON objects...Patrick Cloke2020-07-1622-82/+80
* Combine nginx federation server blocks (#7823)Luke Faraone2020-07-161-11/+5
* Optimise queueing of inbound replication commands (#7861)Richard van der Hoff2020-07-162-116/+216
* Reject attempts to join empty rooms over federation (#7859)Richard van der Hoff2020-07-162-2/+14
* Allow moving typing off master (#7869)Erik Johnston2020-07-1610-178/+284
* Add ability to run multiple pusher instances (#7855)Erik Johnston2020-07-169-82/+293
* Merge pull request #7866 from matrix-org/rav/fix_guest_user_idRichard van der Hoff2020-07-1611-81/+196
|\
| * changelogRichard van der Hoff2020-07-161-0/+1
| * Use a postgres sequence to generate guest user IDsRichard van der Hoff2020-07-164-51/+82
| * Use SequenceGenerator for state group ID allocationRichard van der Hoff2020-07-164-26/+11
| * Use `PostgresSequenceGenerator` from `MultiWriterIdGenerator`Richard van der Hoff2020-07-161-4/+4
| * Add some helper classes for generating ID sequencesRichard van der Hoff2020-07-161-0/+98
* | Add some tiny type annotations (#7870)Richard van der Hoff2020-07-163-8/+7
* | Remove obsolete comment.Olivier Wilkinson (reivilibre)2020-07-161-2/+0
* | Ensure that calls to `json.dumps` are compatible with the standard library js...Patrick Cloke2020-07-158-13/+22
* | Avoid brand new rooms in `delete_old_current_state_events` (#7854)Richard van der Hoff2020-07-152-10/+56
* | Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse into developErik Johnston2020-07-153-4/+5
|\ \ | |/ |/|
| * Fix testsErik Johnston2020-07-151-2/+2
| * Fix typoErik Johnston2020-07-151-1/+1
| * NewsfileErik Johnston2020-07-151-0/+1
| * Use get_users_in_room rather than state handler in typing for speedErik Johnston2020-07-151-2/+2
* | Allow accounts to be re-activated from the admin APIs. (#7847)Patrick Cloke2020-07-155-22/+90
* | Fix client reader sharding tests (#7853)Erik Johnston2020-07-157-174/+300
|/
* Convert E2E key and room key handlers to async/await. (#7851)Patrick Cloke2020-07-155-361/+521
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-154-30/+27
* remove `retry_on_integrity_error` wrapper for persist_events (#7848)Richard van der Hoff2020-07-152-67/+1
* Fix bug in per-room message retention policies. (#7850)Patrick Cloke2020-07-142-1/+2
* Allow email subjects to be customised through Synapse's configuration (#7846)Brendan Abolivier2020-07-144-39/+202
* Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-1412-113/+775
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-146-15/+182
* Improve the type hints of synapse.api.errors. (#7820)Patrick Cloke2020-07-142-55/+74
* Clearly state built-in ACME no longer works (#7824)Luke Faraone2020-07-141-7/+5
* Correctly pass app_name to all email templates. (#7829)Erik Johnston2020-07-142-2/+9
* Support handling registration requests across multiple client readers. (#7830)Patrick Cloke2020-07-133-1/+136
* Fix handling of "off" in encryption_enabled_by_default_for_room_type (#7822)Brendan Abolivier2020-07-132-1/+7
* Update grafana dashboardRichard van der Hoff2020-07-131-85/+214
* Merge branch 'master' into developRichard van der Hoff2020-07-133-4/+14
|\
| * 1.17.0 v1.17.0 github/release-v1.17.0 release-v1.17.0Richard van der Hoff2020-07-133-4/+14
* | Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-107-28/+17
* | Add types to the server code and remove unused parameter (#7813)Patrick Cloke2020-07-102-30/+42
* | Include room states on invite events sent to ASes (#6455)Sorunome2020-07-102-4/+17
* | Merge branch 'release-v1.17.0' into developRichard van der Hoff2020-07-103-0/+41
|\|
| * Merge branch 'master' into release-v1.17.0Richard van der Hoff2020-07-103-0/+41
| |\
| | * update changelog v1.16.1 github/release-v1.16.1 release-v1.16.1Richard van der Hoff2020-07-101-1/+1
| | * fix migration, againRichard van der Hoff2020-07-101-1/+1
| | * fix changelogRichard van der Hoff2020-07-101-6/+0
| | * 1.16.1Richard van der Hoff2020-07-104-2/+26
| | * Drop incorrectly-added table `local_rejections_stream`. (#7816)Richard van der Hoff2020-07-102-0/+23
* | | Add ability to shard the federation sender (#7798)Erik Johnston2020-07-1015-157/+670