summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| | * 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
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-30108-1533/+2353
|\| |
| * | 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
* | | Merge branch 'develop' into matrix-org-hotfixesAndrew Morgan2020-10-284-8/+25
|\| |
| * | 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
* | | Patch to temporarily drop cross-user m.key_share_requests (#8675)Andrew Morgan2020-10-283-0/+9
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-27119-426/+2287
|\| |
| * | 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
| * | Correct the package name in OpenID Connect install instructions (#8634)Andrew Morgan2020-10-262-1/+2
| |\ \
| | * | ChangelogAndrew Morgan2020-10-221-0/+1
| | * | Correct the package name in authlib install instructionsAndrew Morgan2020-10-221-1/+1
| * | | Add field `total` to device list in admin API (#8644)Dirk Klimpel2020-10-264-2/+23
| * | | Check status codes that profile handler returns (#8580)LEdoian2020-10-262-0/+8
| * | | Start fewer opentracing spans (#8640)Erik Johnston2020-10-268-53/+96
| * | | Fix typos and spelling errors. (#8639)Patrick Cloke2020-10-2341-60/+63
| * | | Fix handling of User-Agent headers with bad utf-8. (#8632)Erik Johnston2020-10-238-28/+33
| * | | Fix email notifications for invites without local state. (#8627)Erik Johnston2020-10-233-13/+58
| |/ /
| * | Merge tag 'v1.22.0rc1' into developErik Johnston2020-10-2289-88/+101
| |\ \
| * | | Remove unused OPTIONS handlers. (#8621)Patrick Cloke2020-10-2214-64/+2
| * | | Don't 500 for invalid group IDs (#8628)Erik Johnston2020-10-222-1/+5
| * | | Type hints for RegistrationStore (#8615)Erik Johnston2020-10-224-74/+85
| * | | Don't instansiate Requester directly (#8614)Erik Johnston2020-10-226-11/+12
* | | | Merge branch 'release-v1.22.0' into matrix-org-hotfixesErik Johnston2020-10-2696-109/+198
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | |/ | |/|
| * | Fixup changelog even more v1.22.0rc1Erik Johnston2020-10-221-2/+1
| * | Fixup changelog some moreErik Johnston2020-10-221-7/+3
| * | Fixup changelogErik Johnston2020-10-221-4/+4
| * | 1.22.0rc1Erik Johnston2020-10-2289-88/+106
| |/
* | Merge remote-tracking branch 'origin/release-v1.21.3' into matrix-org-hotfixesErik Johnston2020-10-2284-781/+1264
|\|
| * Optimise CacheDescriptor (#8594) github/release-v1.21.3 release-v1.21.3Richard van der Hoff2020-10-212-5/+8
| * Merge pull request #8593 from matrix-org/rav/cache_hacking/3Richard van der Hoff2020-10-212-3/+16
| |\
| | * fix failure caseRichard van der Hoff2020-10-211-1/+4
| | * optimise DeferredCache.setRichard van der Hoff2020-10-212-3/+13
| |/
| * Merge pull request #8572 from matrix-org/rav/cache_hacking/2Richard van der Hoff2020-10-216-271/+441
| |\
| | * Add some more testsRichard van der Hoff2020-10-212-0/+147
| | * Push some deferred wrangling down into DeferredCacheRichard van der Hoff2020-10-215-46/+67
| | * Combine the two sets of tests for CacheDescriptorRichard van der Hoff2020-10-212-228/+230
| * | Limit AS transactions to 100 events (#8606)Will Hunt2020-10-213-2/+58
| * | Separate the TCP and terse JSON formatting code. (#8587)Patrick Cloke2020-10-214-187/+240
| * | Pin mypy-zope for compatibility with mypy. (#8600)Patrick Cloke2020-10-212-1/+2
| * | Add type hints to profile and base handlers. (#8609)Patrick Cloke2020-10-216-41/+72
| |/
| * Consistently use wrap_as_background_task in more places (#8599)Patrick Cloke2020-10-205-30/+20
| * Update mypy to 0.790, and move dependencies to extras (#8583)Jonathan de Jong2020-10-203-3/+4
| * Remove some extraneous @unittest.INFOs on unit tests (#8592)Andrew Morgan2020-10-203-2/+1
| * Cast errors generated during synapse_port_db to str (#8585)Andrew Morgan2020-10-202-2/+4
| * Move schema file for as_device_stream (#8590)Will Hunt2020-10-202-3/+3
| * Fix 'LruCache' object has no attribute '_on_resize' (#8591)Richard van der Hoff2020-10-193-2/+17
| * Drop unused `device_max_stream_id` table (#8589)Vasilis Gerakaris2020-10-192-0/+2
| * Fix mypy error: auth handler "checkpw" internal function type mismatch (#8569)Jonathan de Jong2020-10-193-4/+6
| * Expose the experimental appservice login flow to clients. (#8504)Patrick Cloke2020-10-192-0/+3
| * Add `DeferredCache.get_immediate` method (#8568)Richard van der Hoff2020-10-197-27/+53
| * Include a simple message in email notifications that include encrypted conten...Patrick Cloke2020-10-199-75/+107
| * Support running synmark on macOS. (#8578)Patrick Cloke2020-10-192-2/+6
| * Start an opentracing span for background processes. (#8567)Erik Johnston2020-10-192-5/+7
| * Replace DeferredCache with LruCache where possible (#8563)Richard van der Hoff2020-10-198-27/+30
| * Pre-emptively fix synapse.storage.types.Connection for future mypy release (#...Jonathan de Jong2020-10-173-3/+4
| * Fix synmark (#8571)Richard van der Hoff2020-10-162-1/+2
| * Type annotations for LruCache (#8562)Richard van der Hoff2020-10-166-31/+95
| |\
| | * review commentsRichard van der Hoff2020-10-161-3/+8
| | * Apply suggestions from code reviewRichard van der Hoff2020-10-162-2/+2
| | * changelogRichard van der Hoff2020-10-161-0/+1
| | * type annotations for LruCacheRichard van der Hoff2020-10-165-31/+89
| * | Clean-up old transaction IDs on the background worker. (#8544)Patrick Cloke2020-10-162-1/+2
| * | Add .venv* to .gitignore (#8566)Jonathan de Jong2020-10-162-0/+2
| |/
| * Make LruCache register its own metrics (#8561)Richard van der Hoff2020-10-168-62/+62
| * Fix modifying events in `ThirdPartyRules` modules (#8564)Richard van der Hoff2020-10-163-2/+8
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-10-1676-790/+2026
|\|
| * Merge pull request #8535 from matrix-org/rav/third_party_events_updatesRichard van der Hoff2020-10-156-81/+118
| |\
| | * changelogRichard van der Hoff2020-10-131-0/+1
| | * guard against accidental modificationRichard van der Hoff2020-10-133-3/+30
| | * Allow ThirdPartyRules modules to replace event contentRichard van der Hoff2020-10-133-9/+75
| | * 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-157-25/+33
| * | Send some ephemeral events to appservices (#8437)Will Hunt2020-10-1516-122/+563
| * | Add option to scripts-dev/lint.sh to only lint files changed since the last g...Andrew Morgan2020-10-154-12/+90
| * | Merge branch 'master' into developPatrick Cloke2020-10-154-2/+32
| |\ \
| | * | Additional tweaks. v1.21.2 github/release-v1.21.2 release-v1.21.2Patrick Cloke2020-10-151-3/+3
| | * | Clarify authlib changes.Patrick Cloke2020-10-151-1/+3
| | * | Fix typo.Patrick Cloke2020-10-151-1/+1
| | * | Add additional release notes.Patrick Cloke2020-10-151-0/+13
| | * | 1.21.2Patrick Cloke2020-10-154-2/+17
| * | | Merge branch 'release-v1.21.2' into developPatrick Cloke2020-10-150-0/+0
| |\| |
| | * | Remove racey assertion in MultiWriterIDGenerator (#8530)Erik Johnston2020-10-152-7/+1
| * | | Enable mypy for synapse.util.caches (#8547)Richard van der Hoff2020-10-155-10/+185
| * | | Merge pull request #8548 from matrix-org/rav/deferred_cacheRichard van der Hoff2020-10-1512-374/+454
| |\ \ \
| | * | | changelogRichard van der Hoff2020-10-141-0/+1
| | * | | Combine the two sets of DeferredCache testsRichard van der Hoff2020-10-142-74/+75
| | * | | move DeferredCache into its own moduleRichard van der Hoff2020-10-1410-332/+367
| | * | | Rename Cache->DeferredCacheRichard van der Hoff2020-10-148-25/+30
| | * | | 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-153-3/+27
| * | | Merge pull request #8537 from matrix-org/rav/simplify_locally_reject_inviteRichard van der Hoff2020-10-159-65/+56
| |\ \ \
| | * | | changelogRichard van der Hoff2020-10-131-0/+1
| | * | | Simplify `_locally_reject_invite`Richard van der Hoff2020-10-136-57/+52
| | * | | Remove redundant `token_id` parameter to create_eventRichard van der Hoff2020-10-134-8/+3
| | |/ /
| * | | Use autocommit mode for single statement DB functions. (#8542)Erik Johnston2020-10-145-70/+156
| * | | Remove racey assertion in MultiWriterIDGenerator (#8530)Erik Johnston2020-10-142-7/+1
| * | | Add note to manhole.md about bind_address when using with docker (#8526)Christopher May-Townsend2020-10-142-7/+40
| * | | Update documentation on retention policies limits (#8529)Brendan Abolivier2020-10-142-12/+23
| * | | Add basic tests for sync/pagination with vector clock tokens. (#8488)Erik Johnston2020-10-143-1/+249
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-1415-22/+63
|\| | |
| * | | Fix not sending events over federation when using sharded event persisters (#...Erik Johnston2020-10-1410-21/+51
| * | | Make sure a retention policy is a state event (#8527)Brendan Abolivier2020-10-143-0/+8
| * | | Add correct M_BAD_JSON error code to /profile/{userId}/displayname (#8517)Aaron Raimist2020-10-142-1/+4
| |/ /
* | | Revert "block membership events from spammy freenode bridge"Richard van der Hoff2020-10-131-4/+0
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-13277-2950/+4829
|\| |
| * | Move additional tasks to the background worker, part 4 (#8513)Patrick Cloke2020-10-1311-221/+196
| * | Fix message duplication if something goes wrong after persisting the event (#...Erik Johnston2020-10-1313-32/+481
| * | Merge branch 'master' into developAndrew Morgan2020-10-134-2/+18
| |\|
| | * 1.21.1 v1.21.1 github/release-v1.21.1 release-v1.21.1Andrew Morgan2020-10-133-3/+13
| | * Explicitly install test dependencies when building deb packages (#8523)Andrew Morgan2020-10-122-1/+7
| * | Multi arch docker support: add arm/v7 and arm64 to our docker images (#7921)Christopher May-Townsend2020-10-122-8/+53
| * | Merge branch 'master' into developAndrew Morgan2020-10-123-4/+25
| |\|
| | * Reverse proxies are not the only thing to change;be explicit w/ new endpoint v1.21.0 github/release-v1.21.0 release-v1.21.0Andrew Morgan2020-10-121-6/+7
| | * Add deprecation warning for admin api under client api prefixesAndrew Morgan2020-10-121-0/+8
| | * 1.21.0Andrew Morgan2020-10-123-1/+13
| * | Make event persisters periodically announce position over replication. (#8499)Erik Johnston2020-10-129-34/+128
| * | Docker: support passing additional commandline args to synapse (#8390)Samuel Philipp2020-10-113-18/+44
| * | Clean-up some broken/unused code in the test framework (#8514)Patrick Cloke2020-10-093-70/+55
| * | Fix threadsafety in ThreadedMemoryReactorClock (#8497)Richard van der Hoff2020-10-092-4/+33
| * | Increase default max_upload_size from 10M to 50M (#8502)Mateusz PrzybyƂowicz2020-10-095-5/+6
| * | Add type hints to response cache. (#8507)Patrick Cloke2020-10-099-34/+48
| * | Allow modules to create and send events into rooms (#8479)Andrew Morgan2020-10-095-8/+157
| * | Only send RDATA for instance local events. (#8496)Erik Johnston2020-10-096-25/+54
| * | Move additional tasks to the background worker, part 3 (#8489)Patrick Cloke2020-10-098-282/+276
| * | Remove the deprecated Handlers object (#8494)Patrick Cloke2020-10-0940-157/+116
| * | Add type hints to some handlers (#8505)Patrick Cloke2020-10-0910-22/+60
| * | Invalidate the cache when an olm fallback key is uploaded (#8501)Hubert Chathi2020-10-083-0/+25
| * | Merge tag 'v1.21.0rc3' into developErik Johnston2020-10-084-3/+16
| |\|
| | * Update change log v1.21.0rc3Erik Johnston2020-10-081-1/+1
| | * 1.21.0rc3Erik Johnston2020-10-084-3/+16
| * | Add useful shields to readme (#8493)Mateusz PrzybyƂowicz2020-10-082-7/+24
| * | Clarify error message when plugin config parsers raise an error (#8492)Richard van der Hoff2020-10-082-1/+2
| * | Merge remote-tracking branch 'origin/release-v1.21.0' into developErik Johnston2020-10-072-0/+2
| |\|
| * | Move additional tasks to the background worker (#8458)Patrick Cloke2020-10-078-197/+195
| * | Include the configured log level in phone home stats. (#8477)Patrick Cloke2020-10-072-0/+8
| * | Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-077-8/+112
| * | Use vector clocks for room stream tokens. (#8439)Erik Johnston2020-10-074-42/+380
| * | Add typing information to the device handler. (#8407)Patrick Cloke2020-10-074-38/+59
| * | Fix returning incorrect prev_batch token in incremental sync (#8486)Erik Johnston2020-10-072-1/+7
| * | unblacklist some tests (#8474)Richard van der Hoff2020-10-073-34/+1
| * | Add support for MSC2697: Dehydrated devices (#8380)Hubert Chathi2020-10-079-21/+454
| * | Merge pull request #8463 from matrix-org/rav/clean_up_event_handlingRichard van der Hoff2020-10-076-92/+83
| |\ \
| | * | update wordingRichard van der Hoff2020-10-071-2/+3
| | * | changelogRichard van der Hoff2020-10-051-0/+1
| | * | kill off `send_nonmember_event`Richard van der Hoff2020-10-054-53/+31
| | * | 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-0710-58/+51
| * | | Remove docs/sphinx and related references (#8480)Andrew Morgan2020-10-0762-839/+1
| * | | Add support for MSC2732: olm fallback keys (#8312)Hubert Chathi2020-10-068-1/+215
| * | | Additional tests for third-party event rules (#8468)Richard van der Hoff2020-10-063-18/+79
| * | | Merge pull request #8467 from matrix-org/rav/fix_3pevent_rulesRichard van der Hoff2020-10-063-2/+5
| |\ \ \
| | * | | Fix third-party event modules for `check_visibility_can_be_modified` checkRichard van der Hoff2020-10-053-2/+5
| * | | | Don't bother responding to client requests that have already disconnected (#8...Andrew Morgan2020-10-063-0/+12
| * | | | Update default room version to 6 (#8461)Richard van der Hoff2020-10-054-3/+13
| |/ / /
| * / / Ensure that event.redacts is the proper type before handling it (#8457)Patrick Cloke2020-10-052-0/+3
| |/ /
| * | Allow ThirdPartyEventRules modules to manipulate public room state (#8292)Andrew Morgan2020-10-058-19/+223
| * | Remove stream ordering from Metadata dict (#8452)Richard van der Hoff2020-10-0513-33/+53
| * | Update manhole documentation for async/await. (#8462)Patrick Cloke2020-10-052-2/+6
| * | Do not assume that account data is of the correct form. (#8454)Patrick Cloke2020-10-056-21/+34
| * | Add logging on startup/shutdown (#8448)Erik Johnston2020-10-0225-113/+152
| * | Speed up unit tests when using PostgreSQL (#8450)Erik Johnston2020-10-023-1/+17
| * | Allow background tasks to be run on a separate worker. (#8369)Patrick Cloke2020-10-0219-449/+537
| * | Merge tag 'v1.21.0rc2' into developRichard van der Hoff2020-10-0214-141/+163
| |\ \
| * | | Include a public_baseurl in configs generated by the demo script. (#8443)Patrick Cloke2020-10-022-0/+3
| * | | Add unit test for event persister sharding (#8433)Erik Johnston2020-10-028-27/+371
| * | | Add config option for always using "userinfo endpoint" for OIDC (#7658)BBBSnowball2020-10-016-15/+65
* | | | block membership events from spammy freenode bridgeRichard van der Hoff2020-10-121-0/+4
* | | | Merge remote-tracking branch 'origin/release-v1.21.0' into matrix-org-hotfixesErik Johnston2020-10-0716-11/+129
|\ \ \ \ | | |_|/ | |/| |
| * | | Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-077-5/+109
| * | | Add Ubuntu 20.10 (Groovy Gorilla) to build scripts. (#8475)Patrick Cloke2020-10-072-0/+2
| | |/ | |/|
| * | move #8444 to 'feature' v1.21.0rc2Richard van der Hoff2020-10-021-1/+5
| * | linkify changelogRichard van der Hoff2020-10-021-1/+1
| * | 1.21.0rc2Richard van der Hoff2020-10-021-1/+1
| * | 1.21.0rc2Richard van der Hoff2020-10-027-6/+14
* | | Merge remote-tracking branch 'origin/release-v1.21.0' into matrix-org-hotfixesRichard van der Hoff2020-10-0217-140/+150
|\| |
| * | Fix bug in remote thumbnail search (#8438)Richard van der Hoff2020-10-022-20/+24
| * | Fix DB query on startup for negative streams. (#8447)Erik Johnston2020-10-022-1/+2
| * | Convert additional templates to Jinja (#8444)Patrick Cloke2020-10-029-116/+121
| * | Fix malformed log line in new federation "catch up" logic (#8442)Richard van der Hoff2020-10-022-1/+2
| * | Do not expose the experimental appservice login flow to clients. (#8440)Patrick Cloke2020-10-012-2/+1
* | | Revert "fix remote thumbnails?"Richard van der Hoff2020-10-021-21/+5
* | | fix remote thumbnails?Richard van der Hoff2020-10-011-5/+21
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-10-01105-141/+141
|\ \ \ | | |/ | |/|
| * | Merge tag 'v1.21.0rc1' into developRichard van der Hoff2020-10-0188-88/+103
| |\|
| | * update changelog v1.21.0rc1Richard van der Hoff2020-10-012-2/+1
| | * fix a logging error in thumbnailer (#8435)Richard van der Hoff2020-10-012-1/+2
| | * changelog fixesRichard van der Hoff2020-10-011-2/+1
| | * fix version numberRichard van der Hoff2020-10-012-3/+3
| | * 1.21.0Richard van der Hoff2020-10-0187-87/+103
| * | Enable mypy checking for unreachable code and fix instances. (#8432)Patrick Cloke2020-10-0117-53/+38
| |/
* | Revert "Temporary fix to ensure kde can contact matrix.org if stuff breaks"Richard van der Hoff2020-10-011-4/+0
* | Remove redundant `EventCreationHandler._is_worker_app` attributeRichard van der Hoff2020-10-011-3/+1
* | Fix typo in commentRichard van der Hoff2020-10-011-1/+1
* | Remove dangling changelog.d filesRichard van der Hoff2020-10-014-4/+0
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2020-10-01392-2451/+7422
|\|
| * Add prometheus metrics to track federation delays (#8430)Richard van der Hoff2020-10-018-6/+88
| * Make token serializing/deserializing async (#8427)Erik Johnston2020-09-3017-59/+115
| * Merge pull request #8425 from matrix-org/rav/extremity_metricsRichard van der Hoff2020-09-305-84/+144
| |\
| | * changelogRichard van der Hoff2020-09-301-0/+1
| | * Add an improved "forward extremities" metricRichard van der Hoff2020-09-301-2/+25
| | * Rewrite BucketCollectorRichard van der Hoff2020-09-303-71/+89
| | * Fix _exposition.py to stop stripping samplesRichard van der Hoff2020-09-301-11/+29