summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '63593134a' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-57/+58
|\
| * Some cleanups to device inbox store. (#9041)Erik Johnston2021-01-072-57/+58
* | Merge commit '23d701864' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-215-42/+194
|\|
| * Improve the performance of calculating ignored users in large rooms (#9024)Patrick Cloke2021-01-074-34/+183
| * Handle updating schema version without any deltas. (#9033)Erik Johnston2021-01-071-7/+10
| * Empty iterables should count towards cache usage. (#9028)Patrick Cloke2021-01-061-1/+1
* | Merge commit '0312266ee' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2118-146/+410
|\|
| * Merge tag 'v1.25.0rc1' into developPatrick Cloke2021-01-065-15/+8
| |\
| * | Handle a display name / avatar URL not included in a federation request. (#9023)Patrick Cloke2021-01-061-2/+2
| * | Add type hints to the logging context code. (#8939)Patrick Cloke2021-01-053-22/+46
| * | Implement MSC2176: Updated redaction rules (#8984)Patrick Cloke2021-01-053-9/+41
| * | Add initial support for a "pick your IdP" page (#9017)Richard van der Hoff2021-01-059-3/+168
| * | Combine the SSO Redirect Servlets (#9015)Richard van der Hoff2021-01-046-112/+172
* | | Merge commit '2fe0fb21f' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-217-47/+69
|\ \ \ | | |/ | |/|
| * | 1.25.0rc1Patrick Cloke2021-01-061-1/+1
| * | Fix-up assertions about last stream token in push (#9020)Patrick Cloke2021-01-054-14/+7
| |/
| * Add type hints to the receipts and user directory handlers. (#8976)Patrick Cloke2021-01-042-32/+61
* | Merge commit '1c9a85056' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2120-299/+486
|\|
| * Add type hints to the crypto module. (#8999)Patrick Cloke2021-01-046-108/+150
| * Use the SSO handler helpers for CAS registration/login. (#8856)Patrick Cloke2021-01-032-39/+77
| * Check if group IDs are valid before using them. (#8977)Patrick Cloke2020-12-302-4/+46
| * Add additional type hints to the storage module. (#8980)Patrick Cloke2020-12-3010-148/+213
* | Merge commit '9999eb2d0' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-218-106/+129
|\|
| * Add type hints to admin and room list handlers. (#8973)Patrick Cloke2020-12-293-70/+94
| * Validate input parameters for the sendToDevice API. (#8975)Patrick Cloke2020-12-291-1/+2
| * Update the value of group_creation_prefix in sample config. (#8992)Jerin J Titus2020-12-291-1/+1
| * Allow redacting events on workers (#8994)Patrick Cloke2020-12-292-34/+14
| * Drop the unused local_invites table. (#8979)Patrick Cloke2020-12-291-0/+18
* | Merge commit '4218473f9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-217-73/+322
|\|
| * Refactor the CAS handler in prep for using the abstracted SSO code. (#8958)Patrick Cloke2020-12-182-66/+158
| * Send the location of the web client to the IS when inviting via 3PIDs. (#8930)Patrick Cloke2020-12-182-0/+27
| * Allow server admin to get admin bit in rooms where local user is an admin (#8...Erik Johnston2020-12-182-2/+136
| * Fix mainline ordering in state res v2 (#8971)Erik Johnston2020-12-181-1/+1
* | Merge commit '28877fade' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-2118-68/+633
|\|
| * Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-189-45/+512
| * Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-187-18/+114
| * Ensure that a URL exists in the content during push. (#8965)Patrick Cloke2020-12-182-2/+6
* | Merge commit 'a7a913918' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-208-25/+222
|\|
| * Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-185-7/+41
| |\
| | * Correctly handle AS registerations and add testErik Johnston2020-12-174-7/+34
| * | Try and drop stale extremities. (#8929)Erik Johnston2020-12-184-18/+188
* | | Merge commit 'c9c1c9d82' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-204-19/+24
|\| |
| * | Use the simple dictionary in full text search for the user directory (#8959)Brendan Abolivier2020-12-171-12/+12
| * | Fix a bug that deactivated users appear in the directory (#8933)Dirk Klimpel2020-12-171-2/+6
| * | Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-172-5/+6
* | | Merge commit '7932d4e9f' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-201-0/+7
|\ \ \ | | |/ | |/|
| * | Don't MAU limit AS ghost usersErik Johnston2020-12-171-0/+7
* | | Merge commit 'ff5c4da12' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-208-112/+139
|\ \ \ | | |/ | |/|
| * | Add a maximum size for well-known lookups. (#8950)Patrick Cloke2020-12-163-18/+52
| * | Push login completion down into SsoHandler (#8941)Richard van der Hoff2020-12-163-82/+75
| * | Fix the sample config location for the ip_range_whitelist setting. (#8954)Patrick Cloke2020-12-162-12/+12
* | | Merge commit 'bd30cfe86' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-1620-223/+312
|\| |
| * | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-1612-195/+255
| * | Do not assume that the contents dictionary includes history_visibility. (#8945)Patrick Cloke2020-12-168-28/+57
* | | Merge commit '01333681b' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-1612-92/+63
|\| |
| * | Preparatory refactoring of the SamlHandlerTestCase (#8938)Richard van der Hoff2020-12-151-0/+23
| * | Fix handling of stream tokens for push. (#8943)Patrick Cloke2020-12-155-50/+17
| * | Fix startup failure with localdb_enabled: False (#8937)Richard van der Hoff2020-12-141-14/+12
| * | Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-145-28/+11
* | | lintAndrew Morgan2021-04-162-23/+5
* | | Merge commit 'f14428b25' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-1627-194/+356
|\| |
| * | Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-1116-65/+82
| * | Add type hints to the push module. (#8901)Patrick Cloke2020-12-116-80/+155
| * | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-113-10/+26
| * | Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-112-16/+64
| * | Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-112-11/+17
| * | Fix deadlock on SIGHUP (#8918)Erik Johnston2020-12-101-1/+5
* | | Merge commit 'c64002e1c' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-167-93/+155
|\| |
| * | Refactor `SsoHandler.get_mxid_from_sso` (#8900)Richard van der Hoff2020-12-102-28/+50
| * | Fix buglet in DirectRenderJsonResource (#8897)Richard van der Hoff2020-12-101-3/+5
| * | Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-094-62/+100
* | | Merge commit 'cf7d3c90d' into dinsicAndrew Morgan2021-04-1641-263/+837
|\| |
| * | Merge branch 'master' into developErik Johnston2020-12-092-2/+6
| |\|
| * | Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-081-0/+5
| * | Better formatting for config errors from modules (#8874)Richard van der Hoff2020-12-0812-37/+159
| * | Simplify the flow for SSO UIA (#8881)Richard van der Hoff2020-12-085-40/+142
| * | Clarify config template comments (#8891)Richard van der Hoff2020-12-082-8/+4
| * | Call set_avatar_url with target_user, not user_id (#8872)Will Hunt2020-12-071-2/+2
| * | Do not raise a 500 exception when previewing empty media. (#8883)Patrick Cloke2020-12-071-1/+5
| * | Add type hints for HTTP and email pushers. (#8880)Patrick Cloke2020-12-076-101/+164
| * | Add type hints to the push mailer module. (#8882)Patrick Cloke2020-12-071-40/+83
| * | Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-042-6/+51
| * | Pass room_id to get_auth_chain_difference (#8879)Erik Johnston2020-12-043-5/+12
| * | Add additional validation to pusher URLs. (#8865)Patrick Cloke2020-12-042-3/+16
| * | Do not 500 if the content-length is not provided when uploading media. (#8862)Patrick Cloke2020-12-041-1/+1
| * | Merge tag 'v1.24.0rc2' into developPatrick Cloke2020-12-044-15/+29
| |\ \
| * | | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-031-1/+1
| * | | Merge pull request #8858 from matrix-org/rav/sso_uiaRichard van der Hoff2020-12-024-16/+86
| |\ \ \
| | * | | UIA: offer only available auth flowsRichard van der Hoff2020-12-023-15/+85
| | * | | fix up various test casesRichard van der Hoff2020-12-021-1/+1
| * | | | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-0213-69/+115
| * | | | Correctly handle unpersisted events when calculating auth chain difference. (...Erik Johnston2020-12-021-4/+83
| * | | | Add additional validation for the admin register endpoint. (#8837)David Florness2020-12-021-0/+3
* | | | | Port "Allow providing credentials to HTTPS_PROXY (#9657)" from mainline (#95)Andrew Morgan2021-03-232-34/+143
* | | | | Stabilise all knock-related unstable identifiers that would be in state (#96)Andrew Morgan2021-03-231-2/+2
* | | | | Port "Add support for no_proxy and case insensitive env variables" from mainl...Andrew Morgan2021-03-2215-89/+163
* | | | | Remove extraneous print (#94)Andrew Morgan2021-03-191-1/+0
* | | | | Change knock room version to v7 (#88)Andrew Morgan2021-03-182-11/+10
* | | | | Allow knock->knock transitions (#86)Andrew Morgan2021-03-021-2/+0
* | | | | change check_threepid_can_be_invited to async (#85)Mathieu Velten2021-03-011-5/+2
* | | | | Add a config option to prioritise local users in user directory search result...Andrew Morgan2021-02-192-9/+59
* | | | | Send a ver query parameter for make_knock (#83)Andrew Morgan2021-02-173-5/+24
* | | | | Show knock rooms in the public room directory and inform clients they can be ...Andrew Morgan2021-02-102-6/+10
* | | | | Add knocking support (#81)Andrew Morgan2021-02-0929-113/+1192
* | | | | Remove riot email registration backwards compatibility hackAndrew Morgan2021-01-291-10/+0
* | | | | Add a parameter to enable/disable freeze feature (#78)Mathieu Velten2021-01-211-1/+9
* | | | | Ensure we read account validity templates from custom template dir if provide...Andrew Morgan2021-01-191-1/+4
* | | | | Change check_3pid_allowed to async (#76)Mathieu Velten2021-01-181-13/+10
* | | | | Merge commit '3e8292d48' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-311-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge commit '1cec3d145' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-311-1/+1
|\ \ \ \ \
| * | | | | 1.23.1 v1.23.1 github/release-v1.23.1 release-v1.23.1Erik Johnston2020-12-091-1/+1
| * | | | | Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-091-1/+5
| * | | | | Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-12-093-53/+48
* | | | | | Merge commit '9b26a4ac8' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-2/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 1.24.0 v1.24.0Erik Johnston2020-12-091-1/+1
| * | | | | Fix installing pysaml2 on Python 3.5. (#8898)Patrick Cloke2020-12-081-1/+5
| | |_|_|/ | |/| | |
* | | | | Merge commit '693dab487' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-314-15/+29
|\| | | |
| * | | | 1.24.0rc2Patrick Cloke2020-12-041-1/+1
| * | | | Fix a regression that mapping providers should be able to redirect users. (#8...Patrick Cloke2020-12-042-6/+23
| * | | | Remove version pin prometheus_client dependency (#8875)Jordan Bancino2020-12-041-8/+5
| | |/ / | |/| |
* | | | Merge commit '53b12688d' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-314-49/+54
|\| | |
| * | | 1.24.0rc1Patrick Cloke2020-12-021-1/+1
| | |/ | |/|
| * | Fix a regression when grandfathering SAML users. (#8855)Patrick Cloke2020-12-023-47/+52
| * | Add basic SAML tests for mapping users. (#8800)Patrick Cloke2020-12-021-1/+1
* | | Merge commit 'd3ed93504' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-317-193/+328
|\| |
| * | Create a `PasswordProvider` wrapper object (#8849)Richard van der Hoff2020-12-021-55/+148
| * | Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-012-129/+163
| * | Add missing `ordering` to background updates (#8850)Richard van der Hoff2020-12-014-12/+12
| * | Allow Date header through CORS (#8804)Nicolas Chamo2020-12-011-1/+1
| * | Don't offer password login when it is disabled (#8835)Richard van der Hoff2020-12-011-1/+9
* | | Merge commit '09ac0569f' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3111-35/+97
|\| |
| * | Simplify appservice login code (#8847)Richard van der Hoff2020-11-301-6/+21
| * | Allow per-room profile to be used for server notice user (#8799)Mathieu Velten2020-11-301-1/+9
| * | Drop (almost) unused index on event_json (#8845)Richard van der Hoff2020-11-302-1/+20
| * | Add a config option to change whether unread push notification counts are per...Andrew Morgan2020-11-303-7/+35
| * | Simplify the way the `HomeServer` object caches its internal attributes. (#8...Jonathan de Jong2020-11-305-21/+21
* | | Merge commit 'a090b8620' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-315-58/+86
|\| |
| * | Add `force_purge` option to delete-room admin api. (#8843)Richard van der Hoff2020-11-302-11/+28
| * | Remove special case of pretty printing JSON responses for curl (#8833)Tulir Asokan2020-11-271-24/+5
| * | Add typing to membership Replication class methods (#8809)Andrew Morgan2020-11-271-22/+44
| * | Defer SIGHUP handlers to reactor. (#8817)Erik Johnston2020-11-261-1/+9
* | | Merge commit '7c4344747' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3120-677/+856
|\| |
| * | Strip trailing / from server_url in register_new_matrix_user (#8823)Dmitry Borodaenko2020-11-261-1/+1
| * | Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-257-58/+28
| * | Fix the formatting of push config section (#8818)Andrew Morgan2020-11-251-15/+20
| * | Speed up remote invite rejection database call (#8815)Andrew Morgan2020-11-252-6/+44
| * | Add additional type hints to HTTP client. (#8812)Patrick Cloke2020-11-252-147/+138
| * | Support trying multiple localparts for OpenID Connect. (#8801)Patrick Cloke2020-11-253-134/+232
| * | Add type hints to matrix federation client / agent. (#8806)Patrick Cloke2020-11-254-195/+228
| * | Properly report user-agent/IP during registration of SSO users. (#8784)Patrick Cloke2020-11-234-122/+171
| * | Improve logging of the mapping from SSO IDs to Matrix IDs. (#8773)Andrew Morgan2020-11-232-5/+12
* | | Merge commit '8ca120df7' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3110-65/+98
|\| |
| * | Improve error checking for OIDC/SAML mapping providers (#8774)Patrick Cloke2020-11-193-8/+29
| * | SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-192-1/+12
| * | Consistently use room_id from federation request body (#8776)Richard van der Hoff2020-11-193-53/+48
| * | Improve appservice handler to send only the most recent read receipts when no...Will Hunt2020-11-183-3/+9
* | | Merge commit '03e392f78' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-311-0/+6
|\| |
| * | SAML: Document allowing a clock/time difference from IdP (#8731)Marcus Schopen2020-11-181-0/+6
| * | Merge branch 'master' into developErik Johnston2020-11-182-1/+5
| |\|
| * | Abstract shared SSO code. (#8765)Patrick Cloke2020-11-174-113/+151
| * | Use TYPE_CHECKING instead of magic MYPY variable. (#8770)Patrick Cloke2020-11-173-9/+6
| * | Add admin API for logging in as a user (#8617)Erik Johnston2020-11-1717-45/+174
* | | Merge commit 'ef366720d' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-1/+5
|\ \ \ | | |/ | |/|
| * | 1.23.0Erik Johnston2020-11-181-1/+1
| * | Cap the version of prometheus_client to <v0.9.0 in the dockerfile (#8767)Andrew Morgan2020-11-171-0/+4
* | | Merged commit 'deff8f628' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3125-166/+337
* | | Merge commit 'f12589547' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-315-32/+39
|\ \ \ | | |/ | |/|
| * | Generalise _locally_reject_invite (#8751)Andrew Morgan2020-11-161-17/+19
| * | Clarify the usecase for an msisdn delegate (#8734)Adrian Wannenmacher2020-11-141-2/+3
| * | Generalise _maybe_store_room_on_invite (#8754)Andrew Morgan2020-11-133-13/+17
| |/
* | Merge commit '4a54b821b' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-317-14/+131
|\|
| * 1.23.0rc1Erik Johnston2020-11-131-1/+1
| * SAML: add <mdui:UIInfo> element examples (#8718)Marcus Schopen2020-11-131-0/+22
| * Add metrics for tracking 3PID /requestToken requests. (#8712)Erik Johnston2020-11-133-0/+32
| * Cache event ID to auth event IDs lookups (#8752)Erik Johnston2020-11-131-12/+70
| * Enable reconnection in DB pool (#8726)Erik Johnston2020-11-121-1/+6
* | Merge commit '89700dfb8' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-314-10/+20
|\|
| * Check support room has only two users before sending a notice (#8728)Will Hunt2020-11-111-1/+1
| * Better error message when a remote resource uses invalid Content-Type (#8719)Andrew Morgan2020-11-111-2/+8
| * Catch exceptions in password_providers (#8636)Nicolai Søborg2020-11-111-4/+9
| * Fix SIGHUP handler (#8697)Richard van der Hoff2020-11-061-3/+2
* | Merge commit 'c3119d153' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3111-14/+338
|\|
| * Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-053-0/+251
| * Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-051-0/+2
| * Block clients from sending server ACLs that lock the local server out. (#8708)Erik Johnston2020-11-032-9/+21
| * Improve error messages of non-str displayname/avatar_url (#8705)Andrew Morgan2020-11-021-2/+6
| * Add base pushrule to notify for jitsi conferences (#8286)David Baker2020-11-021-0/+24
| * Improve start time by adding index to e2e_cross_signing_keys (#8694)Erik Johnston2020-11-022-2/+33
| * Fix error handling around when completing an AS transaction (#8693)Brendan Abolivier2020-10-301-1/+1
* | Merge commit 'f27a78969' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3110-186/+446
|\|
| * Merge branch 'master' into developErik Johnston2020-10-301-1/+1
| |\
| | * use correct versionErik Johnston2020-10-301-1/+1
| | * Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-306-40/+31
| | * Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-301-4/+6
| * | Improve the sample config for SSO (OIDC, SAML, and CAS). (#8635)Patrick Cloke2020-10-303-54/+80
| * | Implement and use an @lru_cache decorator (#8595)Richard van der Hoff2020-10-302-60/+212
| * | Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-303-70/+152
| * | Fix optional parameter in stripped state storage method (#8688)Andrew Morgan2020-10-301-1/+1
* | | Merge commit 'ef2d62701' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3123-652/+499
|\| |
| * | Tie together matches_user_in_member_list and get_users_in_room caches (#8676)Will Hunt2020-10-291-4/+6
| * | Gracefully handle a pending logging connection during shutdown. (#8685)Patrick Cloke2020-10-291-9/+18
| * | Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-2911-105/+166
| * | Fix cache call signature to accept `on_invalidate`. (#8684)Erik Johnston2020-10-291-5/+7
| * | Use `%r` rather than `%s` for stringifying events (#8679)Richard van der Hoff2020-10-291-2/+2
| * | Optimise createRoom with multiple invites (#8559)Richard van der Hoff2020-10-292-13/+24
| * | Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-296-501/+266
* | | Merge commit 'c97da1e45' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3118-154/+292
|\| |
| * | Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-286-40/+31
| |\ \
| | * | remove unused importsRichard van der Hoff2020-10-281-2/+0
| | * | Remove frozendict_json_encoder and support frozendicts everywhereRichard van der Hoff2020-10-286-38/+31
| | |/
| * | Add type hints to application services. (#8655)Patrick Cloke2020-10-283-79/+117
| * | Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-282-1/+55
| * | Don't pull event from DB when handling replication traffic. (#8669)Erik Johnston2020-10-284-31/+86
| * | Tell Black to format code for Python 3.5 (#8664)Dan Callahan2020-10-273-4/+4
* | | Merge commit '88e1d0c52' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-319-38/+211
|\| |
| * | Abstract code for stripping room state into a separate method (#8671)Andrew Morgan2020-10-272-29/+60
| * | Don't unnecessarily start bg process in replication sending loop. (#8670)Erik Johnston2020-10-271-0/+10
| * | Don't unnecessarily start bg process while handling typing. (#8668)Erik Johnston2020-10-271-8/+13
| * | Add admin API to list users' local media (#8647)Dirk Klimpel2020-10-275-1/+128
* | | Merge commit '24229fac0' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3114-43/+420
|\| |
| * | Merge branch 'master' into developErik Johnston2020-10-271-1/+1
| |\|
| * | e2e: ensure we have both master and self-signing key (#8455)Jonas Jelten2020-10-261-5/+22
| * | Add type hints for account validity handler (#8620)Patrick Cloke2020-10-264-12/+29
| * | Split admin API for reported events into a detail and a list view (#8539)Dirk Klimpel2020-10-263-19/+137
| * | Add an admin api to delete local media. (#8519)Dirk Klimpel2020-10-264-3/+220
| * | Fix a bug in the joined_rooms admin API (#8643)Dirk Klimpel2020-10-261-3/+4
| * | Merge tag 'v1.22.0rc2' into developErik Johnston2020-10-261-1/+1
| |\ \
| * \ \ Merge branch 'release-v1.22.0' into developErik Johnston2020-10-262-7/+9
| |\ \ \
| * | | | Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-262-13/+28
| * | | | Add field `total` to device list in admin API (#8644)Dirk Klimpel2020-10-261-1/+1
| * | | | Check status codes that profile handler returns (#8580)LEdoian2020-10-261-0/+7
* | | | | Merge commit 'fedfdfd75' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-311-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 1.22.0 v1.22.0 github/release-v1.22.0 release-v1.22.0Erik Johnston2020-10-271-1/+1
| | |_|/ | |/| |
* | | | Merge commit '7a3adbd7a' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-314-22/+39
|\| | |
| * | | 1.22.0rc2Erik Johnston2020-10-261-1/+1
| | |/ | |/|
| * | Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-262-13/+28
| * | Properly handle presence events for application services. (#8656)Patrick Cloke2020-10-261-4/+5
| * | Fix user_daily_visits to not have duplicate rows for UA. (#8654)Erik Johnston2020-10-261-4/+5
* | | Merge commit '2b7c18087' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3146-132/+187
|\ \ \ | | |/ | |/|
| * | Start fewer opentracing spans (#8640)Erik Johnston2020-10-266-41/+87
| * | Fix typos and spelling errors. (#8639)Patrick Cloke2020-10-2338-56/+58
| * | Fix handling of User-Agent headers with bad utf-8. (#8632)Erik Johnston2020-10-236-22/+14
| * | Fix email notifications for invites without local state. (#8627)Erik Johnston2020-10-231-13/+28
* | | Merge commit '054a6b953' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3111-56/+1
|\| |
| * | Merge tag 'v1.22.0rc1' into developErik Johnston2020-10-221-1/+1
| |\|
| * | Remove unused OPTIONS handlers. (#8621)Patrick Cloke2020-10-2213-64/+1
* | | Merge commit 'b19b63e6b' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-313-75/+87
|\| |
| * | Don't 500 for invalid group IDs (#8628)Erik Johnston2020-10-221-1/+4
| * | Type hints for RegistrationStore (#8615)Erik Johnston2020-10-222-74/+83
* | | Merge commit 'ec0e9c469' into dinsicAndrew Morgan2020-12-313-9/+23
|\ \ \ | | |/ | |/|