summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
* Don't send catchup transactions for matrix hqErik Johnston2021-06-281-0/+1
* Merge branch 'release-v1.37' of github.com:matrix-org/synapse into matrix-org...Brendan Abolivier2021-06-235-10/+60
|\
| * Fix schema delta to not take as long on large servers (#10227)Erik Johnston2021-06-221-2/+5
| * Add endpoints for backfilling history (MSC2716) (#9247)Eric Eastwood2021-06-221-5/+45
| * Fix performance of responding to user key requests over federation (#10221)Erik Johnston2021-06-211-1/+8
| * Fix incorrect time magnitude on delayed call (#10195)Andrew Morgan2021-06-171-1/+1
| * Fix persist_events to stop leaking opentracing contexts (#10193)Richard van der Hoff2021-06-171-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-06-168-158/+259
|\|
| * Make opentracing trace into event persistence (#10134)Richard van der Hoff2021-06-161-5/+41
| * Refactor `EventPersistenceQueue` (#10145)Richard van der Hoff2021-06-141-77/+88
| * Support for database schema version ranges (#9933)Richard van der Hoff2021-06-114-76/+108
| * Fix bug when running presence off master (#10149)Erik Johnston2021-06-112-1/+16
| * Integrate knock rooms with the public rooms directory (#9359)Andrew Morgan2021-06-091-5/+9
| * Implement knock feature (#6739)Sorunome2021-06-092-0/+18
* | Merge branch 'release-v1.36' into matrix-org-hotfixesErik Johnston2021-06-112-1/+16
|\ \
| * | Fix bug when running presence off master (#10149)Erik Johnston2021-06-112-1/+16
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-06-081-3/+9
|\|
| * Fix logging context when opening new DB connection (#10141)Erik Johnston2021-06-081-3/+9
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-06-081-2/+5
|\|
| * More database opentracing (#10136)Richard van der Hoff2021-06-071-2/+5
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-06-042-43/+73
|\|
| * Add OpenTracing for database activity. (#10113)Richard van der Hoff2021-06-031-33/+53
| * Add new admin APIs to remove media by media ID from quarantine. (#10044)Dirk Klimpel2021-06-021-10/+20
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesPatrick Cloke2021-06-024-15/+75
|\|
| * add a cache to have_seen_event (#9953)Richard van der Hoff2021-06-013-14/+74
| * Make reason and score optional for report_event (#10077)Callum Brown2021-05-271-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-05-276-16/+15
|\|
| * Combine `LruCache.invalidate` and `invalidate_many` (#9973)Richard van der Hoff2021-05-275-13/+11
| * Add an admin API for unprotecting local media from quarantine (#10040)Dirk Klimpel2021-05-261-3/+4
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-05-259-46/+143
|\|
| * Add missing type hints to synapse.util (#9982)Patrick Cloke2021-05-241-1/+1
| * Remove `keylen` from `LruCache`. (#9993)Richard van der Hoff2021-05-243-3/+2
| * Fix `get_state_ids_for_event` return type typo to match what the function act...Eric Eastwood2021-05-241-1/+1
| * Don't hammer the database for destination retry timings every ~5mins (#10036)Erik Johnston2021-05-212-31/+39
| * Fixed removal of new presence stream states (#10014)Marek Matys2021-05-211-9/+9
| * Use a database table to hold the users that should have full presence sent to...Andrew Morgan2021-05-182-1/+91
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-05-145-14/+10
|\|
| * Minor `@cachedList` enhancements (#9975)Richard van der Hoff2021-05-143-11/+8
| * Remove unnecessary SystemRandom from SQLBaseStore (#9987)Dan Callahan2021-05-142-3/+2
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-05-12284-45/+100
|\|
| * Add config option to hide device names over federation (#9945)Aaron Raimist2021-05-111-1/+3
| * Add debug logging for issue #9533 (#9959)Richard van der Hoff2021-05-111-0/+18
| * Reorganise the database schema directories (#9932)Richard van der Hoff2021-05-07282-44/+79
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-05-064-6/+11
|\|
| * Use get_current_users_in_room from store and not StateHandler (#9910)Erik Johnston2021-05-053-5/+8
| * Use the parent's logging context name for runWithConnection. (#9895)Patrick Cloke2021-04-281-1/+3
| * Revert "Experimental Federation Speedup (#9702)"Andrew Morgan2021-04-281-12/+16
* | Revert "Experimental Federation Speedup (#9702)"Andrew Morgan2021-04-271-12/+16
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-04-2717-179/+336
|\|
| * Remove various bits of compatibility code for Python <3.6 (#9879)Andrew Morgan2021-04-272-10/+7
| * Split presence out of master (#9820)Erik Johnston2021-04-234-48/+129
| * Only store data in caches, not "smart" objects (#9845)Erik Johnston2021-04-231-72/+89
| * Clear the resync bit after resyncing device lists (#9867)Richard van der Hoff2021-04-221-10/+9
| * Remove `synapse.types.Collection` (#9856)Richard van der Hoff2021-04-2210-19/+34
| * Fix (final) Bugbear violations (#9838)Jonathan de Jong2021-04-201-5/+5
| * Port "Allow users to click account renewal links multiple times without hitti...Andrew Morgan2021-04-192-16/+64
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-04-1971-108/+72
|\|
| * User directory: use calculated room membership state instead (#9821)Andrew Morgan2021-04-161-0/+27
| * Small speed up joining large remote rooms (#9825)Erik Johnston2021-04-161-21/+33
| * Experimental Federation Speedup (#9702)Jonathan de Jong2021-04-141-16/+12
| * Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-1471-71/+0
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-04-1315-122/+135
|\|
| * Bump black configuration to target py36 (#9781)Dan Callahan2021-04-131-4/+4
| * Add an admin API to manage ratelimit for a specific user (#9648)Dirk Klimpel2021-04-131-5/+59
| * Bugbear: Add Mutable Parameter fixes (#9682)Jonathan de Jong2021-04-088-26/+58
| * Merge remote-tracking branch 'origin/develop' into rav/drop_py35Richard van der Hoff2021-04-082-3/+40
| |\
| * | remove unused param on `make_tuple_comparison_clause`Richard van der Hoff2021-04-084-7/+2
| * | Drop support for sqlite<3.22 as wellRichard van der Hoff2021-04-084-80/+12
| * | Require py36 and Postgres 9.6Richard van der Hoff2021-04-081-2/+2
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesPatrick Cloke2021-04-087-17/+96
|\ \ \ | | |/ | |/|
| * | Remove outdated constraint on remote_media_cache_thumbnails (#9725)Richard van der Hoff2021-04-062-3/+40
| |/
| * Update mypy configuration: `no_implicit_optional = True` (#9742)Jonathan de Jong2021-04-051-2/+2
| * Add `order_by` to list user admin API (#9691)Dirk Klimpel2021-04-012-7/+44
| * Deprecate imp (#9718)Cristina2021-03-311-3/+8
| * Replace `room_invite_state_types` with `room_prejoin_state` (#9700)Richard van der Hoff2021-03-301-2/+2
* | Merge remote-tracking branch 'origin/release-v1.31.0' into matrix-org-hotfixesErik Johnston2021-03-303-7/+73
|\|
| * Add type hints to DictionaryCache and TTLCache. (#9442)Patrick Cloke2021-03-291-4/+5
| * Add a storage method for returning all current presence from all users (#9650)Andrew Morgan2021-03-252-3/+68
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-241-1/+1
|\|
| * Enable addtional flake8-bugbear linting checks. (#9659)Jonathan de Jong2021-03-241-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-03-2414-54/+46
|\|
| * Add type hints to misc. files. (#9676)Patrick Cloke2021-03-241-2/+2
| * Add a type hints for service notices to the HomeServer object. (#9675)Patrick Cloke2021-03-242-5/+5
| * Fix federation stall on concurrent access errors (#9639)Jonathan de Jong2021-03-231-36/+9
| * Import HomeServer from the proper module. (#9665)Patrick Cloke2021-03-237-7/+7
| * Consistently check whether a password may be set for a user. (#9636)Dirk Klimpel2021-03-181-0/+1
| * Fix bad naming of storage function (#9637)Erik Johnston2021-03-171-1/+1
| * Prep work for removing `outlier` from `internal_metadata` (#9411)Richard van der Hoff2021-03-172-3/+21
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2021-03-167-24/+256
|\|
| * Don't go into federation catch up mode so easily (#9561)Erik Johnston2021-03-151-5/+5
| * Optimise missing prev_event handling (#9601)Richard van der Hoff2021-03-151-7/+5
| * Convert Requester to attrs (#9586)Richard van der Hoff2021-03-101-3/+3
| * Use the chain cover index in get_auth_chain_ids. (#9576)Patrick Cloke2021-03-101-3/+145
| * Fix a bug in the background task for purging chain cover. (#9583)Patrick Cloke2021-03-101-1/+1
| * Add a background task to purge unused chain IDs. (#9542)Patrick Cloke2021-03-093-6/+98
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-036-18/+47
|\|
| * Fix 'rejected_events_metadata' background update (#9537)Erik Johnston2021-03-031-1/+3
| * Purge chain cover tables when purging events. (#9498)Patrick Cloke2021-03-032-10/+37
| * Add type hints to user admin API. (#9521)Dirk Klimpel2021-03-032-6/+6
| * Bump the mypy and mypy-zope versions. (#9529)Patrick Cloke2021-03-031-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-032-1/+54
|\|
| * Make deleting stale pushers a background update (#9536)Erik Johnston2021-03-032-1/+54
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-03-033-5/+66
|\|
| * Re-run rejected metadata background update. (#9503)Erik Johnston2021-03-021-0/+9
| * Fix SQL delta file taking a long time to run (#9516)Erik Johnston2021-03-022-5/+57
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-02-2613-30/+200
|\|
| * Ensure pushers are deleted for deactivated accounts (#9285)Erik Johnston2021-02-252-0/+64
| * Add SQL delta for deleting stale pushers (#9479)Erik Johnston2021-02-241-0/+19
| * Refactor to ensure we call check_consistency (#9470)Erik Johnston2021-02-247-28/+71
| * Include newly added sequences in the port DB script. (#9449)Patrick Cloke2021-02-232-2/+13
| * Add an `order_by` field to list users' media admin API. (#8978)Dirk Klimpel2021-02-221-3/+38
| * Remove cache for get_shared_rooms_for_users (#9416)Andrew Morgan2021-02-221-3/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-02-222-18/+59
|\|
| * Regenerate exact thumbnails if missing (#9438)Erik Johnston2021-02-191-9/+9
| |\
| | * Regenerate exact thumbnails if missingErik Johnston2021-02-181-9/+9
| * | Add a config option to prioritise local users in user directory search result...Andrew Morgan2021-02-191-9/+50
| |/
* | Merge remote-tracking branch 'origin/release-v1.28.0' into matrix-org-hotfixesErik Johnston2021-02-191-1/+7
|\|
| * Add back the guard against the user directory stream position not existing. (...Patrick Cloke2021-02-181-1/+7
* | Merge branch 'rav/fix_cookie_path' into matrix-org-hotfixesRichard van der Hoff2021-02-182-3/+6
|\|
| * Add the shadow-banning status to the display user admin API. (#9400)Dirk Klimpel2021-02-172-3/+6
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-02-1750-270/+418
|\|
| * Add type hints to groups code. (#9393)Patrick Cloke2021-02-171-2/+7
| * Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-1643-215/+337
| * Fix some typos.Patrick Cloke2021-02-1212-20/+20
| * Remove conflicting sqlite tables that are "reserved" (shadow fts4 tables) (#9...Eric Eastwood2021-02-101-10/+0
| * Update type hints for Cursor to match PEP 249. (#9299)Jonathan de Jong2021-02-054-17/+46
| * Add experimental support for PyPy. (#9123)Jonathan de Jong2021-02-042-6/+8
* | Merge remote-tracking branch 'origin/release-v1.27.0' into matrix-org-hotfixesErik Johnston2021-02-026-33/+94
|\|
| * Merge branch 'social_login' into developRichard van der Hoff2021-02-011-20/+20
| |\
| | * Fix SSO on workers (#9271)Richard van der Hoff2021-02-011-20/+20
| | * Merge tag 'v1.26.0rc2' into social_loginRichard van der Hoff2021-01-255-7/+79
| | |\
| * | | Add phone home stats for encrypted messages. (#9283)Jan Christian Grünhage2021-02-011-0/+56
| * | | Add type hints to E2E handler. (#9232)Patrick Cloke2021-01-281-2/+2
| * | | Add type hints to various handlers. (#9223)Patrick Cloke2021-01-263-11/+16
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-2617-108/+345
|\| | |
| * | | Fix get forward extremities queryJason Robinson2021-01-261-1/+1
| * | | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-262-1/+32
| |\ \ \
| | * | | Don't error if deleting a non-existent pusher. (#9121)Patrick Cloke2021-01-251-1/+3
| | * | | Add an admin API for shadow-banning users. (#9209)Patrick Cloke2021-01-251-0/+29
| * | | | Make natural join inner joinJason Robinson2021-01-261-2/+2
| * | | | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-2339-410/+2048
| |\| | |
| | * | | Speed up chain cover calculation (#9176)Erik Johnston2021-01-212-55/+160
| | * | | Increase perf of handling concurrent use of StreamIDGenerators. (#9190)Erik Johnston2021-01-211-8/+13
| | * | | Merge remote-tracking branch 'origin/release-v1.26.0' into developErik Johnston2021-01-212-1/+19
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge remote-tracking branch 'origin/release-v1.26.0' into developErik Johnston2021-01-214-7/+61
| | |\ \ \
| | * | | | Use execute_batch in more places (#9188)Erik Johnston2021-01-2111-31/+25
| | | |_|/ | | |/| |
| | * | | Use execute_batch instead of executemany in places (#9181)Erik Johnston2021-01-212-12/+11
| * | | | Add depth and received_ts to forward_extremities admin API responseJason Robinson2021-01-231-1/+2
| * | | | Remove trailing whitespace to appease the linterJason Robinson2021-01-111-2/+2
| * | | | Simplify delete_forward_extremities_for_room_txn SQLJason Robinson2021-01-111-10/+4
| * | | | Address pr feedbackJason Robinson2021-01-112-26/+40
| * | | | Don't try to use f-stringsJason Robinson2021-01-111-1/+1
| * | | | Merge branch 'develop' into jaywink/admin-forward-extremitiesJason Robinson2021-01-091-31/+23
| |\ \ \ \
| * | | | | Implement clearing cache after deleting forward extremitiesJason Robinson2021-01-091-8/+33
| * | | | | Add Rooms admin forward extremities DELETE endpointJason Robinson2021-01-081-1/+48
| * | | | | Add forward extremities endpoint to rooms admin APIJason Robinson2021-01-072-0/+22
* | | | | | Merge remote-tracking branch 'origin/release-v1.26.0' into matrix-org-hotfixesErik Johnston2021-01-216-11/+81
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add schema update to fix existing DBs affected by #9193 (#9195)Erik Johnston2021-01-212-1/+19
| | |_|_|/ | |/| | |
| * | | | Fix receipts or account data not being sent down sync (#9193)Erik Johnston2021-01-214-7/+61
| | |_|/ | |/| |
| * | | Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-201-4/+2
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-1910-160/+315
|\| | |
| * | | Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-1810-160/+315
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-183-154/+183
|\| | |
| * | | Make chain cover index bg update go faster (#9124)Erik Johnston2021-01-151-150/+179
| * | | Ensure we store pusher data as text (#9117)Richard van der Hoff2021-01-151-3/+2
| * | | Add type hints to media rest resources. (#9093)Patrick Cloke2021-01-151-1/+2
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-151-13/+28
|\| | |
| * | | Fix perf of get_cross_signing_keys (#9116)Erik Johnston2021-01-141-13/+28
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-145-42/+48
|\| | |
| * | | Fix chain cover background update to work with split out event persisters (#9...Erik Johnston2021-01-144-29/+37
| * | | Fix get destinations to catch up query. (#9114)Erik Johnston2021-01-141-13/+11
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-1419-193/+1445
|\| | |
| * | | Add background update for add chain cover index (#9029)Erik Johnston2021-01-143-16/+243
| * | | Register the /devices endpoint on workers. (#9092)Patrick Cloke2021-01-131-11/+30
| * | | Remove user's avatar URL and displayname when deactivated. (#8932)Dirk Klimpel2021-01-121-1/+1
| * | | Move more encryption endpoints off master (#9068)Erik Johnston2021-01-111-44/+44
| * | | Use a chain cover index to efficiently calculate auth chain difference (#8868)Erik Johnston2021-01-116-22/+839
| * | | Remove old tables after schema version bump (#9055)Erik Johnston2021-01-115-59/+36
| * | | Ensure rejected events get added to some metadata tables (#9016)Erik Johnston2021-01-113-24/+166
| * | | Drop last_used column from access_tokens (#9025)Jerin J Titus2021-01-112-0/+78
| | |/ | |/|
| * | Fix error handling during insertion of client IPs (#9051)Erik Johnston2021-01-081-31/+23
| |/
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-084-113/+215
|\|
| * Allow running sendToDevice on workers (#9044)Erik Johnston2021-01-074-65/+158
| * Some cleanups to device inbox store. (#9041)Erik Johnston2021-01-071-49/+58
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-073-37/+185
|\|
| * Improve the performance of calculating ignored users in large rooms (#9024)Patrick Cloke2021-01-073-30/+175
| * Handle updating schema version without any deltas. (#9033)Erik Johnston2021-01-071-7/+10
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-071-3/+5
|\|
| * Add type hints to the logging context code. (#8939)Patrick Cloke2021-01-051-3/+5
* | Merge remote-tracking branch 'origin/release-v1.25.0' into matrix-org-hotfixesRichard van der Hoff2021-01-0519-227/+561
|\|
| * Add type hints to the crypto module. (#8999)Patrick Cloke2021-01-041-5/+5
| * Add additional type hints to the storage module. (#8980)Patrick Cloke2020-12-308-144/+211
| * Add type hints to admin and room list handlers. (#8973)Patrick Cloke2020-12-291-2/+5
| * Drop the unused local_invites table. (#8979)Patrick Cloke2020-12-291-0/+18
| * Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-182-0/+56
| * Try and drop stale extremities. (#8929)Erik Johnston2020-12-181-16/+184
| * Use the simple dictionary in full text search for the user directory (#8959)Brendan Abolivier2020-12-171-12/+12
| * Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-172-5/+6
| * Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-163-41/+59
| * Do not assume that the contents dictionary includes history_visibility. (#8945)Patrick Cloke2020-12-161-2/+5
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesPatrick Cloke2020-12-151-10/+0
|\|
| * Fix handling of stream tokens for push. (#8943)Patrick Cloke2020-12-151-10/+0
* | Merge branch 'develop' into matrix-org-hotfixesPatrick Cloke2020-12-154-1/+77
|\|
| * Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-111-0/+32
| * Pass room_id to get_auth_chain_difference (#8879)Erik Johnston2020-12-041-1/+3
| * UIA: offer only available auth flowsRichard van der Hoff2020-12-022-0/+42
* | Merge branch 'release-v1.24.0' of github.com:matrix-org/synapse into matrix-o...Patrick Cloke2020-12-026-13/+32
|\|
| * Add missing `ordering` to background updates (#8850)Richard van der Hoff2020-12-014-12/+12
| * Drop (almost) unused index on event_json (#8845)Richard van der Hoff2020-11-302-1/+20
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-11-274-6/+47
|\|
| * Speed up remote invite rejection database call (#8815)Andrew Morgan2020-11-251-1/+33
| * Improve appservice handler to send only the most recent read receipts when no...Will Hunt2020-11-181-1/+6
| * Add admin API for logging in as a user (#8617)Erik Johnston2020-11-171-0/+2
| * Generalise _maybe_store_room_on_invite (#8754)Andrew Morgan2020-11-131-4/+6
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-11-135-15/+236
|\|
| * 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
| * Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-051-0/+127
| * Improve start time by adding index to e2e_cross_signing_keys (#8694)Erik Johnston2020-11-022-2/+33
* | Merge branch 'rav/fix_sighup' into matrix-org-hotfixesRichard van der Hoff2020-10-311-1/+1
|\|
| * Fix error handling around when completing an AS transaction (#8693)Brendan Abolivier2020-10-301-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-308-61/+211
|\|
| * Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-301-0/+27
| * Fix optional parameter in stripped state storage method (#8688)Andrew Morgan2020-10-301-1/+1
| * Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-292-9/+56
| * Merge pull request #8678 from matrix-org/rav/fix_frozen_eventsRichard van der Hoff2020-10-282-9/+7
| |\
| | * Remove frozendict_json_encoder and support frozendicts everywhereRichard van der Hoff2020-10-282-9/+7
| * | Add type hints to application services. (#8655)Patrick Cloke2020-10-281-38/+60
| * | Don't pull event from DB when handling replication traffic. (#8669)Erik Johnston2020-10-281-2/+6
| * | Tell Black to format code for Python 3.5 (#8664)Dan Callahan2020-10-271-2/+2
| * | Abstract code for stripping room state into a separate method (#8671)Andrew Morgan2020-10-271-1/+53
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-277-95/+287
|\| |
| * | Add admin API to list users' local media (#8647)Dirk Klimpel2020-10-273-0/+60
| * | Add type hints for account validity handler (#8620)Patrick Cloke2020-10-262-4/+4
| * | Split admin API for reported events into a detail and a list view (#8539)Dirk Klimpel2020-10-261-17/+87
| * | Add an admin api to delete local media. (#8519)Dirk Klimpel2020-10-261-0/+53
| * | Merge branch 'release-v1.22.0' into developErik Johnston2020-10-261-4/+5
| |\|
| * | Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-261-7/+22
| * | Type hints for RegistrationStore (#8615)Erik Johnston2020-10-222-74/+83
* | | Merge branch 'release-v1.22.0' into matrix-org-hotfixesErik Johnston2020-10-262-11/+27
|\ \ \ | | |/ | |/|
| * | Fix get|set_type_stream_id_for_appservice store functions (#8648)Will Hunt2020-10-261-7/+22
| * | Fix user_daily_visits to not have duplicate rows for UA. (#8654)Erik Johnston2020-10-261-4/+5
| |/
* | Merge remote-tracking branch 'origin/release-v1.21.3' into matrix-org-hotfixesErik Johnston2020-10-2213-58/+47
|\|
| * Add type hints to profile and base handlers. (#8609)Patrick Cloke2020-10-211-3/+3
| * Consistently use wrap_as_background_task in more places (#8599)Patrick Cloke2020-10-202-14/+13
| * Move schema file for as_device_stream (#8590)Will Hunt2020-10-201-3/+2
| * Drop unused `device_max_stream_id` table (#8589)Vasilis Gerakaris2020-10-191-0/+1
| * Add `DeferredCache.get_immediate` method (#8568)Richard van der Hoff2020-10-193-12/+3
| * Replace DeferredCache with LruCache where possible (#8563)Richard van der Hoff2020-10-195-22/+21
| * Pre-emptively fix synapse.storage.types.Connection for future mypy release (#...Jonathan de Jong2020-10-172-3/+3