summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-1617-204/+266
* Merge pull request #8951 from matrix-org/rav/username_picker_2Richard van der Hoff2020-12-163-82/+106
|\
| * changelogRichard van der Hoff2020-12-151-0/+1
| * Make `_make_callback_with_userinfo` asyncRichard van der Hoff2020-12-151-68/+83
| * Remove spurious mocking of complete_sso_loginRichard van der Hoff2020-12-151-2/+0
| * Test `get_extra_attributes` fallbackRichard van der Hoff2020-12-152-12/+22
* | Merge pull request #8946 from matrix-org/rav/refactor_send_requestRichard van der Hoff2020-12-1660-1028/+776
|\ \
| * | lintRichard van der Hoff2020-12-155-7/+3
| * | changelogRichard van der Hoff2020-12-151-0/+1
| * | Remove spurious "SynapseRequest" result from `make_request"Richard van der Hoff2020-12-1559-983/+742
| * | Remove redundant reading of SynapseRequest.argsRichard van der Hoff2020-12-151-9/+1
| * | Skip redundant check on `request.args`Richard van der Hoff2020-12-151-2/+1
| * | remove 'response' result from `_get_shared_rooms`Richard van der Hoff2020-12-151-8/+9
| * | Replace `request.code` with `channel.code`Richard van der Hoff2020-12-158-22/+22
| |/
* | Fix generate_log_config script (#8952)Richard van der Hoff2020-12-162-1/+4
* | Do not assume that the contents dictionary includes history_visibility. (#8945)Patrick Cloke2020-12-169-28/+58
|/
* Preparatory refactoring of the SamlHandlerTestCase (#8938)Richard van der Hoff2020-12-155-54/+126
* Fix handling of stream tokens for push. (#8943)Patrick Cloke2020-12-156-50/+18
* Fix startup failure with localdb_enabled: False (#8937)Richard van der Hoff2020-12-143-14/+36
* Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-1411-39/+20
* Preparatory refactoring of the OidcHandlerTestCase (#8911)Richard van der Hoff2020-12-142-141/+146
* Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-1119-73/+98
* Add type hints to the push module. (#8901)Patrick Cloke2020-12-119-86/+159
* Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-114-10/+27
* Improve tests for structured logging. (#8916)Patrick Cloke2020-12-112-27/+47
* Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-116-27/+138
* Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-114-11/+34
* Don't publish `latest` docker image until all archs are built (#8909)Richard van der Hoff2020-12-102-3/+5
* Fix deadlock on SIGHUP (#8918)Erik Johnston2020-12-102-1/+6
* Refactor `SsoHandler.get_mxid_from_sso` (#8900)Richard van der Hoff2020-12-103-28/+51
* Fix buglet in DirectRenderJsonResource (#8897)Richard van der Hoff2020-12-102-3/+6
* Deprecate Shutdown Room and Purge Room Admin API (#8829)Dirk Klimpel2020-12-105-11/+63
* Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-0910-89/+172
* Skip the SAML tests if xmlsec1 isn't available. (#8905)Patrick Cloke2020-12-092-0/+24
* Combine related media admin API docs (#8839)Dirk Klimpel2020-12-093-50/+87
* Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2020-12-092-3/+6
|\
| * Merge pull request #8906 from matrix-org/rav/fix_multiarch_buildsRichard van der Hoff2020-12-092-3/+6
| |\
| | * Pin the docker version for multiarch buildsRichard van der Hoff2020-12-092-3/+6
* | | Merge branch 'release-v1.24.0' into developErik Johnston2020-12-091-1/+2
|\ \ \
| * | | Add 'xmlsec1' to dependency list github/release-v1.24.0 release-v1.24.0Erik Johnston2020-12-091-1/+2
* | | | Merge branch 'master' into developErik Johnston2020-12-092-0/+60
|\ \ \ \ | | |/ / | |/| |
| * | | Merge tag 'v1.23.1'Erik Johnston2020-12-092-0/+60
| |\ \ \ | | |/ / | |/| |
| | * | 1.23.1 v1.23.1 github/release-v1.23.1 release-v1.23.1Erik Johnston2020-12-095-3/+59
| | * | Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-092-1/+6
| | * | Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-12-095-54/+49
| | |/
* | | Merge branch 'master' into developErik Johnston2020-12-094-2/+58
|\| |
| * | 1.24.0 v1.24.0Erik Johnston2020-12-094-2/+53
| * | Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-082-1/+6
* | | Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-083-0/+19
* | | Better formatting for config errors from modules (#8874)Richard van der Hoff2020-12-0813-37/+160
* | | Simplify the flow for SSO UIA (#8881)Richard van der Hoff2020-12-087-40/+144
* | | Clarify config template comments (#8891)Richard van der Hoff2020-12-084-16/+9
* | | Call set_avatar_url with target_user, not user_id (#8872)Will Hunt2020-12-073-3/+9
* | | Do not raise a 500 exception when previewing empty media. (#8883)Patrick Cloke2020-12-073-12/+22
* | | Add type hints for HTTP and email pushers. (#8880)Patrick Cloke2020-12-078-101/+168
* | | Add type hints to the push mailer module. (#8882)Patrick Cloke2020-12-073-40/+85
* | | Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-047-15/+184
* | | Pass room_id to get_auth_chain_difference (#8879)Erik Johnston2020-12-046-17/+33
* | | Add additional validation to pusher URLs. (#8865)Patrick Cloke2020-12-046-30/+106
* | | Do not 500 if the content-length is not provided when uploading media. (#8862)Patrick Cloke2020-12-042-1/+2
* | | Merge tag 'v1.24.0rc2' into developPatrick Cloke2020-12-049-18/+81
|\| |
| * | Minor update to CHANGES. v1.24.0rc2Patrick Cloke2020-12-041-1/+1
| * | 1.24.0rc2Patrick Cloke2020-12-044-3/+16
| * | Fix a regression that mapping providers should be able to redirect users. (#8...Patrick Cloke2020-12-046-8/+60
| * | Remove version pin prometheus_client dependency (#8875)Jordan Bancino2020-12-043-9/+7
* | | Fix a buglet in the SAML username mapping provider doc (#8873)Richard van der Hoff2020-12-042-1/+4
* | | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-033-1/+3
* | | Merge pull request #8861 from matrix-org/rav/remove_unused_mocksRichard van der Hoff2020-12-037-143/+7
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/remove_unused_mocksRichard van der Hoff2020-12-0215-111/+367
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #8858 from matrix-org/rav/sso_uiaRichard van der Hoff2020-12-0213-73/+366
|\ \ \ \
| * | | | newsfileRichard van der Hoff2020-12-021-0/+1
| * | | | UIA: offer only available auth flowsRichard van der Hoff2020-12-026-33/+278
| * | | | Factor out FakeResponse from test_oidcRichard van der Hoff2020-12-022-16/+28
| * | | | fix up various test casesRichard van der Hoff2020-12-025-17/+38
| * | | | Add `create_resource_dict` method to HomeserverTestCaseRichard van der Hoff2020-12-021-7/+21
* | | | | remove unused FakeResponse (#8864)Richard van der Hoff2020-12-022-26/+1
| | * | | changelogRichard van der Hoff2020-12-021-0/+1
| | * | | remove unused DeferredMockCallableRichard van der Hoff2020-12-021-90/+1
| | * | | remove unused `resource_for_federation`Richard van der Hoff2020-12-022-18/+13
| | * | | Remove redundant mockingRichard van der Hoff2020-12-025-36/+5
| |/ / / |/| | |
* | | | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-0243-115/+176
* | | | Correctly handle unpersisted events when calculating auth chain difference. (...Erik Johnston2020-12-024-5/+216
* | | | Add missing prometheus rules for persisted events (#8802)Johanna Dorothea Reichmann2020-12-022-0/+19
* | | | Add additional validation for the admin register endpoint. (#8837)David Florness2020-12-022-0/+4
| |/ / |/| |
* | | Minor changes to the CHANGES doc. v1.24.0rc1Patrick Cloke2020-12-021-1/+1
* | | Minor fixes to changelog.Patrick Cloke2020-12-021-5/+5
* | | 1.24.0rc1Patrick Cloke2020-12-0255-54/+73
|/ /
* | Fix a regression when grandfathering SAML users. (#8855)Patrick Cloke2020-12-026-48/+94
* | Add basic SAML tests for mapping users. (#8800)Patrick Cloke2020-12-025-19/+156
* | Create a `PasswordProvider` wrapper object (#8849)Richard van der Hoff2020-12-023-57/+152
* | Allow specifying room version in 'RestHelper.create_room_as' and add typing (...Andrew Morgan2020-12-022-2/+26
* | Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-015-147/+190
* | Add missing `ordering` to background updates (#8850)Richard van der Hoff2020-12-015-12/+13
* | Allow Date header through CORS (#8804)Nicolas Chamo2020-12-012-1/+2
* | Don't offer password login when it is disabled (#8835)Richard van der Hoff2020-12-013-4/+115
* | Add some tests for `password_auth_providers` (#8819)Richard van der Hoff2020-12-013-0/+488
* | Fix broken testcase (#8851)Richard van der Hoff2020-12-012-1/+1
* | Fix typo in password_auth_providers docAndrew Morgan2020-12-011-0/+1
* | Simplify appservice login code (#8847)Richard van der Hoff2020-11-302-6/+22
* | Allow per-room profile to be used for server notice user (#8799)Mathieu Velten2020-11-302-1/+10
* | Drop (almost) unused index on event_json (#8845)Richard van der Hoff2020-11-303-1/+21
* | Add a config option to change whether unread push notification counts are per...Andrew Morgan2020-11-306-9/+207
* | Simplify the way the `HomeServer` object caches its internal attributes. (#8...Jonathan de Jong2020-11-3011-35/+39
* | Add `force_purge` option to delete-room admin api. (#8843)Richard van der Hoff2020-11-304-12/+34
* | Remove special case of pretty printing JSON responses for curl (#8833)Tulir Asokan2020-11-272-24/+6
* | Add typing to membership Replication class methods (#8809)Andrew Morgan2020-11-272-22/+45
* | Update example prometheus console (#8824)Dirk Klimpel2020-11-262-51/+51
* | Defer SIGHUP handlers to reactor. (#8817)Erik Johnston2020-11-262-1/+10
* | Strip trailing / from server_url in register_new_matrix_user (#8823)Dmitry Borodaenko2020-11-262-1/+2
* | Improve documentation how to configure prometheus for workers (#8822)Dirk Klimpel2020-11-263-20/+65
* | Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-2516-68/+176
* | Fix the formatting of push config section (#8818)Andrew Morgan2020-11-253-29/+40
* | Speed up remote invite rejection database call (#8815)Andrew Morgan2020-11-253-6/+45
* | Add additional type hints to HTTP client. (#8812)Patrick Cloke2020-11-255-149/+142
* | Support trying multiple localparts for OpenID Connect. (#8801)Patrick Cloke2020-11-256-136/+330
* | Add type hints to matrix federation client / agent. (#8806)Patrick Cloke2020-11-256-195/+231
* | Clarify documentation of the admin list media API (#8795)Dirk Klimpel2020-11-242-0/+2
* | Add a script to sign arbitrary json objects. (#8772)Richard van der Hoff2020-11-243-0/+129
* | Update turn-howto (#8779)Richard van der Hoff2020-11-242-8/+124
* | Properly report user-agent/IP during registration of SSO users. (#8784)Patrick Cloke2020-11-236-122/+173
* | Fix synctl and duplicate worker spawning (#8798)Waylon Cude2020-11-232-0/+8
* | Improve logging of the mapping from SSO IDs to Matrix IDs. (#8773)Andrew Morgan2020-11-233-5/+13
* | INSTALL: Fix setting content-type on well-known (#8793)Daniele Sluijters2020-11-232-1/+2
* | fix MDMatthew Hodgson2020-11-221-2/+2
* | fix ancient changelog to be MDMatthew Hodgson2020-11-221-150/+146
* | Improve error checking for OIDC/SAML mapping providers (#8774)Patrick Cloke2020-11-197-29/+137
* | SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-194-1/+21
* | Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-11-195-54/+49
* | Improve appservice handler to send only the most recent read receipts when no...Will Hunt2020-11-184-3/+10
* | Fix tests on develop (#8777)Erik Johnston2020-11-182-16/+1
* | SAML: Document allowing a clock/time difference from IdP (#8731)Marcus Schopen2020-11-183-0/+13
* | Merge branch 'master' into developErik Johnston2020-11-186-4/+28
|\|
| * Update changelog v1.23.0 github/release-v1.23.0 release-v1.23.0Erik Johnston2020-11-181-1/+1
| * Fix formatting in upgradesErik Johnston2020-11-181-1/+1
| * Update changelogErik Johnston2020-11-181-0/+4
| * 1.23.0Erik Johnston2020-11-184-2/+16
| * Cap the version of prometheus_client to <v0.9.0 in the dockerfile (#8767)Andrew Morgan2020-11-173-1/+7
* | Merge pull request #8761 from matrix-org/rav/test_request_renderingRichard van der Hoff2020-11-1759-813/+103
|\ \
| * | changelogRichard van der Hoff2020-11-161-0/+1
| * | Remove redundant `HomeserverTestCase.render`Richard van der Hoff2020-11-1644-629/+0
| * | Remove redundant calls to `render()`Richard van der Hoff2020-11-1613-106/+32
| * | Make `make_request` actually render the requestRichard van der Hoff2020-11-169-68/+57
| * | Fix the URL in the URL preview testsRichard van der Hoff2020-11-161-19/+22
* | | Abstract shared SSO code. (#8765)Patrick Cloke2020-11-176-120/+159
* | | a comma too much (#8771)chagai952020-11-172-1/+2
* | | Use TYPE_CHECKING instead of magic MYPY variable. (#8770)Patrick Cloke2020-11-174-9/+7
* | | Add admin API for logging in as a user (#8617)Erik Johnston2020-11-1725-87/+475
|/ /
* | Merge pull request #8757 from matrix-org/rav/pass_site_to_make_requestRichard van der Hoff2020-11-1617-88/+228
|\ \
| * | fixup testRichard van der Hoff2020-11-161-0/+1
| * | Merge branch 'develop' into rav/pass_site_to_make_requestRichard van der Hoff2020-11-1689-120/+147
| |\ \
| * | | changelogRichard van der Hoff2020-11-151-0/+1
| * | | use global make_request() directly where we have a custom ResourceRichard van der Hoff2020-11-1511-60/+154
| * | | fix dict handling for make_request()Richard van der Hoff2020-11-152-3/+2
| * | | pass a Site into make_requestRichard van der Hoff2020-11-154-20/+68
| * | | pass a Site into RestHelperRichard van der Hoff2020-11-152-6/+7
* | | | Move `wait_until_result` into `FakeChannel` (#8758)Richard van der Hoff2020-11-163-25/+24
* | | | Generalise _locally_reject_invite (#8751)Andrew Morgan2020-11-162-17/+20
| |/ / |/| |
* | | Rename `create_test_json_resource` to `create_test_resource` (#8759)Richard van der Hoff2020-11-167-23/+16
* | | Add a `custom_headers` param to `make_request` (#8760)Richard van der Hoff2020-11-164-11/+24
* | | Clarify the usecase for an msisdn delegate (#8734)Adrian Wannenmacher2020-11-143-4/+7
* | | Generalise _maybe_store_room_on_invite (#8754)Andrew Morgan2020-11-134-13/+18
| |/ |/|
* | Fix changelog v1.23.0rc1Erik Johnston2020-11-131-4/+4
* | Fix changelogErik Johnston2020-11-131-2/+2
* | 1.23.0rc1Erik Johnston2020-11-1371-70/+87
|/
* Migrate documentation `docs/admin_api/event_reports` to markdown (#8742)Dirk Klimpel2020-11-133-165/+173
* SAML: add <mdui:UIInfo> element examples (#8718)Marcus Schopen2020-11-133-0/+45
* Updating README.rst (#8746)chagai952020-11-132-6/+11
* Add metrics for tracking 3PID /requestToken requests. (#8712)Erik Johnston2020-11-134-0/+33
* Fix port script so that it can be run again after failure. (#8755)Erik Johnston2020-11-132-30/+55
* Cache event ID to auth event IDs lookups (#8752)Erik Johnston2020-11-132-12/+71
* Enable reconnection in DB pool (#8726)Erik Johnston2020-11-122-1/+7
* Fix port script fails when DB has no backfilled events. (#8729)Erik Johnston2020-11-112-7/+6
* Fix port script to handle foreign key constraints (#8730)Erik Johnston2020-11-113-6/+63
* Check support room has only two users before sending a notice (#8728)Will Hunt2020-11-112-1/+2
* Better error message when a remote resource uses invalid Content-Type (#8719)Andrew Morgan2020-11-112-2/+9
* Catch exceptions in password_providers (#8636)Nicolai Søborg2020-11-112-4/+10
* Notes on SSO logins and media_repository worker (#8701)Marcus Schopen2020-11-062-0/+6
* Add documentation about documentation to CONTRIBUTING.md (#8714)Andrew Morgan2020-11-062-0/+19
* Fix SIGHUP handler (#8697)Richard van der Hoff2020-11-062-3/+3
* Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-056-0/+820
* Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-055-9/+138
* Consolidate purge table lists to prevent desyncronisation (#8713)Andrew Morgan2020-11-042-67/+39
* Remove the "draft" status of the Room Details Admin API (#8702)Dirk Klimpel2020-11-032-3/+2
* Block clients from sending server ACLs that lock the local server out. (#8708)Erik Johnston2020-11-035-9/+80
* Document how to set up multiple event persisters (#8706)Erik Johnston2020-11-032-0/+13
* grammarMatthew Hodgson2020-11-021-1/+1
* Improve error messages of non-str displayname/avatar_url (#8705)Andrew Morgan2020-11-022-2/+7
* Add base pushrule to notify for jitsi conferences (#8286)David Baker2020-11-022-0/+25
* Use Python 3.8 in Docker images by default (#8698)Dan Callahan2020-11-022-1/+2
* Improve start time by adding index to e2e_cross_signing_keys (#8694)Erik Johnston2020-11-024-2/+36
* typoMatthew Hodgson2020-11-021-1/+1
* Fix typos in systemd-with-workers docAndrew Morgan2020-11-021-2/+2
* Fix typo in workers docAndrew Morgan2020-11-021-1/+1
* Fix error handling around when completing an AS transaction (#8693)Brendan Abolivier2020-10-302-1/+2
* Merge branch 'master' into developErik Johnston2020-10-305-3/+17
|\
| * Fix changelog v1.22.1 github/release-v1.22.1 release-v1.22.1Erik Johnston2020-10-301-2/+2
| * use correct versionErik Johnston2020-10-302-2/+2
| * 1.22.1Erik Johnston2020-10-304-2/+16
* | Merge branch 'release-v1.22.1' into developErik Johnston2020-10-300-0/+0
|\|
| * Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-307-40/+32
| * Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-302-4/+7
* | Improve the sample config for SSO (OIDC, SAML, and CAS). (#8635)Patrick Cloke2020-10-305-104/+157
* | Implement and use an @lru_cache decorator (#8595)Richard van der Hoff2020-10-304-61/+272
* | Fail test cases if they fail to await all awaitables (#8690)Patrick Cloke2020-10-303-2/+39
* | Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-306-71/+431
* | Fix optional parameter in stripped state storage method (#8688)Andrew Morgan2020-10-302-1/+2
* | Fix unit tests (#8689)Erik Johnston2020-10-292-1/+2
* | Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-292-4/+7
* | Gracefully handle a pending logging connection during shutdown. (#8685)Patrick Cloke2020-10-295-10/+36
* | Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-2922-138/+197
* | Fix cache call signature to accept `on_invalidate`. (#8684)Erik Johnston2020-10-293-16/+35
* | Use `%r` rather than `%s` for stringifying events (#8679)Richard van der Hoff2020-10-292-2/+3
* | Optimise createRoom with multiple invites (#8559)Richard van der Hoff2020-10-293-13/+25
* | Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-2919-1011/+706
* | Don't require hiredis to run unit tests (#8680)Erik Johnston2020-10-292-1/+11
* | Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-287-40/+32
|\ \
| * | remove unused importsRichard van der Hoff2020-10-281-2/+0
| * | Remove frozendict_json_encoder and support frozendicts everywhereRichard van der Hoff2020-10-287-38/+32
| |/
* | Add type hints to application services. (#8655)Patrick Cloke2020-10-285-79/+122
* | Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-285-1/+259
* | Run mypy as part of the lint.sh script. (#8633)kleph2020-10-283-2/+4
* | Don't pull event from DB when handling replication traffic. (#8669)Erik Johnston2020-10-285-31/+87
* | Tell Black to format code for Python 3.5 (#8664)Dan Callahan2020-10-2710-11/+12
* | Minor updates to docs on how to run tests (#8666)Dan Callahan2020-10-273-10/+6
* | Note support for Python 3.9 (#8665)Dan Callahan2020-10-274-2/+4
* | Cross-link documentation to the prometheus recording rules. (#8667)Michael Kaye2020-10-273-1/+4
* | Abstract code for stripping room state into a separate method (#8671)Andrew Morgan2020-10-273-29/+61
* | Don't unnecessarily start bg process in replication sending loop. (#8670)Erik Johnston2020-10-272-0/+11
* | Don't unnecessarily start bg process while handling typing. (#8668)Erik Johnston2020-10-272-8/+14
* | Add admin API to list users' local media (#8647)Dirk Klimpel2020-10-278-1/+494
* | Merge branch 'master' into developErik Johnston2020-10-273-1/+13
|\|
| * 1.22.0 v1.22.0 github/release-v1.22.0 release-v1.22.0Erik Johnston2020-10-273-1/+13
* | e2e: ensure we have both master and self-signing key (#8455)Jonas Jelten2020-10-262-5/+23
* | Add type hints for account validity handler (#8620)Patrick Cloke2020-10-266-12/+31
* | Split admin API for reported events into a detail and a list view (#8539)Dirk Klimpel2020-10-266-86/+411
* | Added basic instructions for Azure AD to OpenId documentation (#8582)Peter Krantz2020-10-262-0/+27
* | Add an admin api to delete local media. (#8519)Dirk Klimpel2020-10-267-3/+868
* | Fix filepath of Dex example config (#8657)Andrew Morgan2020-10-262-3/+3
* | Fix a bug in the joined_rooms admin API (#8643)Dirk Klimpel2020-10-263-4/+20
* | Merge tag 'v1.22.0rc2' into developErik Johnston2020-10-265-4/+10
|\|
| * Fixup changelog v1.22.0rc2Erik Johnston2020-10-261-3/+1
| * Expand changelog entryErik Johnston2020-10-261-1/+1
| * 1.22.0rc2Erik Johnston2020-10-265-4/+12
* | Merge branch 'release-v1.22.0' into developErik Johnston2020-10-264-7/+11
|\|
| * Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-264-13/+85
| * Properly handle presence events for application services. (#8656)Patrick Cloke2020-10-262-4/+6
| * Fix user_daily_visits to not have duplicate rows for UA. (#8654)Erik Johnston2020-10-262-4/+6
* | Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-264-13/+85
* | Correct the package name in OpenID Connect install instructions (#8634)Andrew Morgan2020-10-262-1/+2
|\ \
| * | ChangelogAndrew Morgan2020-10-221-0/+1