summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
* | 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
| |/ |/|
* | 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
* 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
* 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
* 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
* 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
* 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
* 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
|\
| * 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
* | 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
* | 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
|/
* 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
* 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
* 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 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
* | 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 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
* | 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 branch 'master' into developErik Johnston2020-10-271-1/+1
|\|
| * 1.22.0 v1.22.0 release-v1.22.0Erik 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
|\|
| * 1.22.0rc2Erik 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
| * 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
* | 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
* | 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 tag 'v1.22.0rc1' into developErik Johnston2020-10-221-1/+1
|\|
| * 1.22.0rc1Erik Johnston2020-10-221-1/+1
* | Remove unused OPTIONS handlers. (#8621)Patrick Cloke2020-10-2213-64/+1
* | 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
|/
* Optimise CacheDescriptor (#8594) release-v1.21.3Richard van der Hoff2020-10-211-5/+7
* fix failure caseRichard van der Hoff2020-10-211-1/+4
* optimise DeferredCache.setRichard van der Hoff2020-10-211-3/+12
* Merge pull request #8572 from matrix-org/rav/cache_hacking/2Richard van der Hoff2020-10-212-34/+55
|\
| * Push some deferred wrangling down into DeferredCacheRichard van der Hoff2020-10-212-34/+55
* | Limit AS transactions to 100 events (#8606)Will Hunt2020-10-211-2/+16
* | Separate the TCP and terse JSON formatting code. (#8587)Patrick Cloke2020-10-212-186/+238
* | Add type hints to profile and base handlers. (#8609)Patrick Cloke2020-10-214-40/+68
|/
* Consistently use wrap_as_background_task in more places (#8599)Patrick Cloke2020-10-204-30/+19
* Move schema file for as_device_stream (#8590)Will Hunt2020-10-201-3/+2
* Fix 'LruCache' object has no attribute '_on_resize' (#8591)Richard van der Hoff2020-10-191-1/+9
* Drop unused `device_max_stream_id` table (#8589)Vasilis Gerakaris2020-10-191-0/+1
* Fix mypy error: auth handler "checkpw" internal function type mismatch (#8569)Jonathan de Jong2020-10-191-3/+5
* Expose the experimental appservice login flow to clients. (#8504)Patrick Cloke2020-10-191-0/+2
* Add `DeferredCache.get_immediate` method (#8568)Richard van der Hoff2020-10-195-23/+29
* Include a simple message in email notifications that include encrypted conten...Patrick Cloke2020-10-197-74/+92
* Start an opentracing span for background processes. (#8567)Erik Johnston2020-10-191-5/+6
* Replace DeferredCache with LruCache where possible (#8563)Richard van der Hoff2020-10-197-27/+29
* Pre-emptively fix synapse.storage.types.Connection for future mypy release (#...Jonathan de Jong2020-10-172-3/+3
* Type annotations for LruCache (#8562)Richard van der Hoff2020-10-165-31/+94
|\
| * review commentsRichard van der Hoff2020-10-161-3/+8
| * Apply suggestions from code reviewRichard van der Hoff2020-10-162-2/+2
| * type annotations for LruCacheRichard van der Hoff2020-10-165-31/+89
* | Clean-up old transaction IDs on the background worker. (#8544)Patrick Cloke2020-10-161-1/+1
|/
* Make LruCache register its own metrics (#8561)Richard van der Hoff2020-10-166-60/+59
* Fix modifying events in `ThirdPartyRules` modules (#8564)Richard van der Hoff2020-10-162-2/+7
* Merge pull request #8535 from matrix-org/rav/third_party_events_updatesRichard van der Hoff2020-10-154-77/+93
|\
| * guard against accidental modificationRichard van der Hoff2020-10-132-3/+10
| * Allow ThirdPartyRules modules to replace event contentRichard van der Hoff2020-10-132-5/+71
| * Move third_party_rules check to event creation timeRichard van der Hoff2020-10-132-52/+13
| * Remove redundant calls to third_party_rules in `on_send_{join,leave}`Richard van der Hoff2020-10-131-19/+1
* | Solidify the HomeServer constructor. (#8515)Jonathan de Jong2020-10-151-5/+9
* | Send some ephemeral events to appservices (#8437)Will Hunt2020-10-1512-99/+499
* | Merge branch 'master' into developPatrick Cloke2020-10-151-1/+1
|\ \
| * | 1.21.2Patrick Cloke2020-10-151-1/+1
| * | Remove racey assertion in MultiWriterIDGenerator (#8530)Erik Johnston2020-10-151-7/+0
* | | Enable mypy for synapse.util.caches (#8547)Richard van der Hoff2020-10-151-1/+1
* | | Merge pull request #8548 from matrix-org/rav/deferred_cacheRichard van der Hoff2020-10-157-256/+313
|\ \ \
| * | | move DeferredCache into its own moduleRichard van der Hoff2020-10-146-286/+300
| * | | Rename Cache->DeferredCacheRichard van der Hoff2020-10-145-16/+21
| * | | Add some more type annotations to CacheRichard van der Hoff2020-10-143-24/+62
| | |/ | |/|
* | | Include user agent in user daily visits table (#8503)Neil Johnson2020-10-152-3/+26
* | | Merge pull request #8537 from matrix-org/rav/simplify_locally_reject_inviteRichard van der Hoff2020-10-154-60/+51
|\ \ \
| * | | Simplify `_locally_reject_invite`Richard van der Hoff2020-10-133-53/+48
| * | | Remove redundant `token_id` parameter to create_eventRichard van der Hoff2020-10-133-7/+3
| |/ /
* | | Use autocommit mode for single statement DB functions. (#8542)Erik Johnston2020-10-144-70/+155
* | | Remove racey assertion in MultiWriterIDGenerator (#8530)Erik Johnston2020-10-141-7/+0
* | | Fix not sending events over federation when using sharded event persisters (#...Erik Johnston2020-10-148-18/+40
* | | Make sure a retention policy is a state event (#8527)Brendan Abolivier2020-10-142-0/+7
* | | Add correct M_BAD_JSON error code to /profile/{userId}/displayname (#8517)Aaron Raimist2020-10-141-1/+3
|/ /
* | Move additional tasks to the background worker, part 4 (#8513)Patrick Cloke2020-10-139-187/+181
* | Fix message duplication if something goes wrong after persisting the event (#...Erik Johnston2020-10-139-29/+313
* | Merge branch 'master' into developAndrew Morgan2020-10-131-1/+1
|\|
| * 1.21.1 v1.21.1 release-v1.21.1Andrew Morgan2020-10-131-1/+1
* | Merge branch 'master' into developAndrew Morgan2020-10-121-1/+1
|\|
| * 1.21.0Andrew Morgan2020-10-121-1/+1
* | Make event persisters periodically announce position over replication. (#8499)Erik Johnston2020-10-126-21/+102
* | Increase default max_upload_size from 10M to 50M (#8502)Mateusz PrzybyƂowicz2020-10-091-2/+2
* | Add type hints to response cache. (#8507)Patrick Cloke2020-10-097-34/+46
* | Allow modules to create and send events into rooms (#8479)Andrew Morgan2020-10-092-7/+34
* | Only send RDATA for instance local events. (#8496)Erik Johnston2020-10-095-25/+53
* | Move additional tasks to the background worker, part 3 (#8489)Patrick Cloke2020-10-097-282/+275
* | Remove the deprecated Handlers object (#8494)Patrick Cloke2020-10-0921-94/+79
* | Add type hints to some handlers (#8505)Patrick Cloke2020-10-098-22/+54
* | Invalidate the cache when an olm fallback key is uploaded (#8501)Hubert Chathi2020-10-081-0/+4
* | Merge tag 'v1.21.0rc3' into developErik Johnston2020-10-081-1/+1
|\|
| * 1.21.0rc3Erik Johnston2020-10-081-1/+1
| * Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-075-5/+107
* | Clarify error message when plugin config parsers raise an error (#8492)Richard van der Hoff2020-10-081-1/+1
* | Move additional tasks to the background worker (#8458)Patrick Cloke2020-10-077-197/+194
* | Include the configured log level in phone home stats. (#8477)Patrick Cloke2020-10-071-0/+7
* | Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-075-8/+110
* | Use vector clocks for room stream tokens. (#8439)Erik Johnston2020-10-073-42/+379
* | Add typing information to the device handler. (#8407)Patrick Cloke2020-10-072-38/+57
* | Fix returning incorrect prev_batch token in incremental sync (#8486)Erik Johnston2020-10-071-1/+6
* | Add support for MSC2697: Dehydrated devices (#8380)Hubert Chathi2020-10-077-21/+371
* | Merge pull request #8463 from matrix-org/rav/clean_up_event_handlingRichard van der Hoff2020-10-073-90/+78
|\ \
| * | update wordingRichard van der Hoff2020-10-071-2/+3
| * | kill off `send_nonmember_event`Richard van der Hoff2020-10-052-51/+27
| * | pull up event.sender assertionRichard van der Hoff2020-10-052-4/+5
| * | Move shadow-ban check down into `handle_new_client_event`.Richard van der Hoff2020-10-051-8/+24
| * | De-duplicate duplicate handlingRichard van der Hoff2020-10-052-38/+32
* | | Combine `SpamCheckerApi` with the more generic `ModuleApi`. (#8464)Richard van der Hoff2020-10-077-50/+45
* | | Add support for MSC2732: olm fallback keys (#8312)Hubert Chathi2020-10-065-1/+148
* | | Additional tests for third-party event rules (#8468)Richard van der Hoff2020-10-061-5/+7
* | | Merge pull request #8467 from matrix-org/rav/fix_3pevent_rulesRichard van der Hoff2020-10-061-1/+3
|\ \ \
| * | | Fix third-party event modules for `check_visibility_can_be_modified` checkRichard van der Hoff2020-10-051-1/+3
* | | | Don't bother responding to client requests that have already disconnected (#8...Andrew Morgan2020-10-062-0/+11
* | | | Update default room version to 6 (#8461)Richard van der Hoff2020-10-051-1/+1
|/ / /
* / / Ensure that event.redacts is the proper type before handling it (#8457)Patrick Cloke2020-10-051-0/+2
|/ /
* | Allow ThirdPartyEventRules modules to manipulate public room state (#8292)Andrew Morgan2020-10-054-6/+131
* | Remove stream ordering from Metadata dict (#8452)Richard van der Hoff2020-10-0512-33/+52
* | Do not assume that account data is of the correct form. (#8454)Patrick Cloke2020-10-055-21/+33
* | Add logging on startup/shutdown (#8448)Erik Johnston2020-10-0221-107/+139
* | Speed up unit tests when using PostgreSQL (#8450)Erik Johnston2020-10-021-1/+12
* | Allow background tasks to be run on a separate worker. (#8369)Patrick Cloke2020-10-0214-447/+512
* | Merge tag 'v1.21.0rc2' into developRichard van der Hoff2020-10-0213-141/+146
|\|
| * 1.21.0rc2Richard van der Hoff2020-10-021-1/+1
| * Fix bug in remote thumbnail search (#8438)Richard van der Hoff2020-10-021-20/+23
| * Fix DB query on startup for negative streams. (#8447)Erik Johnston2020-10-021-1/+1
| * Convert additional templates to Jinja (#8444)Patrick Cloke2020-10-028-116/+120
| * Fix malformed log line in new federation "catch up" logic (#8442)Richard van der Hoff2020-10-021-1/+1
| * Do not expose the experimental appservice login flow to clients. (#8440)Patrick Cloke2020-10-011-2/+0
* | Add unit test for event persister sharding (#8433)Erik Johnston2020-10-022-4/+42
* | Add config option for always using "userinfo endpoint" for OIDC (#7658)BBBSnowball2020-10-012-4/+16
* | Merge tag 'v1.21.0rc1' into developRichard van der Hoff2020-10-012-2/+2
|\|
| * fix a logging error in thumbnailer (#8435)Richard van der Hoff2020-10-011-1/+1
| * fix version numberRichard van der Hoff2020-10-011-1/+1
| * 1.21.0Richard van der Hoff2020-10-011-1/+1
* | Enable mypy checking for unreachable code and fix instances. (#8432)Patrick Cloke2020-10-0115-53/+36
|/
* Add prometheus metrics to track federation delays (#8430)Richard van der Hoff2020-10-016-6/+75
* Make token serializing/deserializing async (#8427)Erik Johnston2020-09-3014-48/+86
* Merge pull request #8425 from matrix-org/rav/extremity_metricsRichard van der Hoff2020-09-303-76/+132
|\
| * Add an improved "forward extremities" metricRichard van der Hoff2020-09-301-2/+25
| * Rewrite BucketCollectorRichard van der Hoff2020-09-302-63/+78
| * Fix _exposition.py to stop stripping samplesRichard van der Hoff2020-09-301-11/+29
* | Allow additional SSO properties to be passed to the client (#8413)Patrick Cloke2020-09-304-11/+135
|/
* Drop support for ancient prometheus_client (#8426)Richard van der Hoff2020-09-302-23/+7
* Merge pull request #8420 from matrix-org/rav/state_res_statsRichard van der Hoff2020-09-303-79/+198
|\
| * Report state res metrics to Prometheus and logRichard van der Hoff2020-09-291-20/+124
| * Move Measure calls into `resolve_events_with_store`Richard van der Hoff2020-09-291-32/+31
| * Expose a `get_resource_usage` method in `Measure`Richard van der Hoff2020-09-291-10/+21
| * Move `resolve_events_with_store` into StateResolutionHandlerRichard van der Hoff2020-09-292-50/+55
* | Various clean ups to room stream tokens. (#8423)Erik Johnston2020-09-2913-66/+87
* | Update description of server_name config option (#8415)Aaron Raimist2020-09-291-4/+17
|/
* Discard an empty upload_name before persisting an uploaded file (#7905)Will Hunt2020-09-292-3/+8
* Don't check whether a 3pid is allowed to register during password reset (#8414)Andrew Morgan2020-09-291-7/+0
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/info-mainli...Andrew Morgan2020-09-299-111/+167
| |\
| * | Don't check whether a 3pid is allowed to register during password resetAndrew Morgan2020-09-281-7/+0
* | | Don't table scan events on worker startup (#8419)Erik Johnston2020-09-291-1/+25