summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Clean-up old transaction IDs on the background worker. (#8544)Patrick Cloke2020-10-161-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-10-1613-95/+319
|\|
| * Send some ephemeral events to appservices (#8437)Will Hunt2020-10-153-9/+130
| * Merge pull request #8548 from matrix-org/rav/deferred_cacheRichard van der Hoff2020-10-153-6/+8
| |\
| | * move DeferredCache into its own moduleRichard van der Hoff2020-10-143-3/+5
| | * Rename Cache->DeferredCacheRichard van der Hoff2020-10-143-6/+6
| * | Include user agent in user daily visits table (#8503)Neil Johnson2020-10-152-3/+26
| * | 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
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-141-0/+4
|\| |
| * | Make sure a retention policy is a state event (#8527)Brendan Abolivier2020-10-141-0/+4
| |/
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-1341-1060/+1861
|\|
| * Move additional tasks to the background worker, part 4 (#8513)Patrick Cloke2020-10-133-152/+150
| * Fix message duplication if something goes wrong after persisting the event (#...Erik Johnston2020-10-135-15/+241
| * Make event persisters periodically announce position over replication. (#8499)Erik Johnston2020-10-122-0/+12
| * Only send RDATA for instance local events. (#8496)Erik Johnston2020-10-093-19/+42
| * Move additional tasks to the background worker, part 3 (#8489)Patrick Cloke2020-10-096-271/+272
| * Add type hints to some handlers (#8505)Patrick Cloke2020-10-091-1/+3
| * Invalidate the cache when an olm fallback key is uploaded (#8501)Hubert Chathi2020-10-081-0/+4
| * Move additional tasks to the background worker (#8458)Patrick Cloke2020-10-075-175/+179
| * Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-075-8/+110
| * Use vector clocks for room stream tokens. (#8439)Erik Johnston2020-10-072-37/+268
| * Add typing information to the device handler. (#8407)Patrick Cloke2020-10-071-3/+3
| * Add support for MSC2697: Dehydrated devices (#8380)Hubert Chathi2020-10-074-4/+133
| * Add support for MSC2732: olm fallback keys (#8312)Hubert Chathi2020-10-062-1/+123
| * Remove stream ordering from Metadata dict (#8452)Richard van der Hoff2020-10-054-23/+22
| * Do not assume that account data is of the correct form. (#8454)Patrick Cloke2020-10-051-2/+7
| * Add logging on startup/shutdown (#8448)Erik Johnston2020-10-0220-107/+134
| * 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-025-259/+266
| * Merge tag 'v1.21.0rc2' into developRichard van der Hoff2020-10-021-1/+1
| |\
* | \ Merge remote-tracking branch 'origin/release-v1.21.0' into matrix-org-hotfixesErik Johnston2020-10-075-5/+107
|\ \ \
| * | | Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-075-5/+107
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/release-v1.21.0' into matrix-org-hotfixesRichard van der Hoff2020-10-021-1/+1
|\| |
| * | Fix DB query on startup for negative streams. (#8447)Erik Johnston2020-10-021-1/+1
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-10-014-18/+10
|\ \ \ | | |/ | |/|
| * | Enable mypy checking for unreachable code and fix instances. (#8432)Patrick Cloke2020-10-014-18/+10
| |/
* | Fix typo in commentRichard van der Hoff2020-10-011-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2020-10-0155-384/+1474
|\|
| * Make token serializing/deserializing async (#8427)Erik Johnston2020-09-301-4/+4
| * Add an improved "forward extremities" metricRichard van der Hoff2020-09-301-2/+25
| * Rewrite BucketCollectorRichard van der Hoff2020-09-301-16/+10
| * Various clean ups to room stream tokens. (#8423)Erik Johnston2020-09-292-20/+23
| * Don't table scan events on worker startup (#8419)Erik Johnston2020-09-291-1/+25
| * Mypy fixes for `synapse.handlers.federation` (#8422)Richard van der Hoff2020-09-293-6/+6
| * Filter out appservices from mau count (#8404)Will Hunt2020-09-291-1/+8
| * Add checks for postgres sequence consistency (#8402)Erik Johnston2020-09-284-2/+99
| * typoMatthew Hodgson2020-09-281-1/+1
| * Allow existing users to login via OpenID Connect. (#8345)Tdxdxoz2020-09-251-2/+2
| * Fix schema delta for servers that have not backfilled (#8396)Erik Johnston2020-09-252-2/+8
| * Fix MultiWriteIdGenerator's handling of restarts. (#8374)Erik Johnston2020-09-244-22/+160
| * Add EventStreamPosition type (#8388)Erik Johnston2020-09-243-11/+19
| * Fix bug which caused failure on join with malformed membership events (#8385)Richard van der Hoff2020-09-231-3/+7
| * Use `async with` for ID gens (#8383)Erik Johnston2020-09-2313-80/+102
| * Don't push if an user account has expired (#8353)Mathieu Velten2020-09-231-0/+14
| * Fix missing null character check on guest_access room stateAndrew Morgan2020-09-221-0/+2
| * Fixed a bug with reactivating users with the admin API (#8362)Dirk Klimpel2020-09-221-1/+1
| * Admin API for reported events (#8217)Dirk Klimpel2020-09-221-0/+95
| * Merge tag 'v1.20.0rc5' into developPatrick Cloke2020-09-181-8/+5
| |\
| | * Intelligently select extremities used in backfill. (#8349)Erik Johnston2020-09-181-8/+5
| * | Catch-up after Federation Outage (bonus): Catch-up on Synapse Startup (#8322)reivilibre2020-09-181-2/+64
| * | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-1825-45/+43
| * | Remove obsolete __future__ imports (#8337)Jonathan de Jong2020-09-171-2/+0
| * | Switch metaclass initialization to python 3-compatible syntax (#8326)Jonathan de Jong2020-09-164-17/+10
| * | Catch-up after Federation Outage (split, 4): catch-up loop (#8272)reivilibre2020-09-151-1/+42
| * | Use slots in attrs classes where possible (#8296)Patrick Cloke2020-09-145-5/+5
| * | Add the topic and avatar to the room details admin API (#8305)Tulir Asokan2020-09-141-1/+2
| * | Add experimental support for sharding event persister. Again. (#8294)Erik Johnston2020-09-147-29/+105
| * | Make `StreamToken.room_key` be a `RoomStreamToken` instance. (#8281)Erik Johnston2020-09-114-56/+61
| * | Merge branch 'release-v1.20.0' into developRichard van der Hoff2020-09-101-2/+3
| |\|
| * | Don't remember `enabled` of deleted push rules and properly return 404 for mi...reivilibre2020-09-092-11/+148
| * | Include method in thumbnail media name (#7124)DeepBlueV7.X2020-09-083-0/+134
| * | Add types to StreamToken and RoomStreamToken (#8279)Erik Johnston2020-09-082-14/+14
| * | Fix `MultiWriterIdGenerator.current_position`. (#8257)Erik Johnston2020-09-081-6/+37
| * | Rename 'populate_stats_process_rooms_2' background job back to 'populate_stat...Andrew Morgan2020-09-082-30/+28
| * | Merge remote-tracking branch 'origin/release-v1.20.0' into developRichard van der Hoff2020-09-085-35/+111
| |\ \
| * | | Run database updates in a transaction (#8265)Richard van der Hoff2020-09-071-5/+22
| * | | Merge branch 'release-v1.20.0' into developRichard van der Hoff2020-09-063-37/+20
| |\ \ \
| * | | | In light of #8255, use BIGINTs for destination_rooms (#8256)reivilibre2020-09-041-1/+1
| * | | | Catch up after Federation Outage (split, 2): Track last successful stream ord...reivilibre2020-09-042-0/+59
| * | | | Catch-up after Federation Outage (split, 1) (#8230)reivilibre2020-09-044-5/+109
* | | | | Intelligently select extremities used in backfill. (#8349)Erik Johnston2020-09-181-8/+5
* | | | | Merge branch 'release-v1.20.0' into matrix-org-hotfixesRichard van der Hoff2020-09-091-2/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix /notifications and pushers misbehaving because of unread counts (#8280)Brendan Abolivier2020-09-081-2/+3
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'origin/release-v1.20.0' into matrix-org-hotfixesRichard van der Hoff2020-09-075-35/+112
|\| | |
| * | | Avoid table-scanning users at startup (#8271)Richard van der Hoff2020-09-071-11/+14
| * | | Fix unread count failing on NULL values (#8270)Brendan Abolivier2020-09-071-1/+6
| * | | Add more logging to debug slow startup (#8264)Richard van der Hoff2020-09-074-7/+32
| * | | Refuse to upgrade database on worker processes (#8266)Richard van der Hoff2020-09-071-17/+61
| | |/ | |/|
* | | Merge branch 'release-v1.20.0' into matrix-org-hotfixesRichard van der Hoff2020-09-0715-66/+46
|\| |
| * | Add cross-signing sigs to the `keys` object (#8234)Richard van der Hoff2020-09-042-34/+17
| * | Unread counts fixes (#8254)Brendan Abolivier2020-09-041-3/+3
| |/
| * Fix type signature in simple_select_one_onecol and friends (#8241)reivilibre2020-09-041-10/+7
| * Stop sub-classing object (#8249)Patrick Cloke2020-09-0412-19/+19
* | Merge branch 'develop' into matrix-org-hotfixesBrendan Abolivier2020-09-048-144/+91
|\|
| * Revert "Add experimental support for sharding event persister. (#8170)" (#8242)Brendan Abolivier2020-09-047-100/+26
| * Split fetching device keys and signatures into two transactions (#8233)Richard van der Hoff2020-09-031-44/+65
* | Merge branch 'develop' into matrix-org-hotfixesBrendan Abolivier2020-09-0336-668/+1159
|\|
| * Fix typing for SyncHandler (#8237)Erik Johnston2020-09-032-5/+5
| * wrap `_get_e2e_device_keys_and_signatures_txn` in a non-txn method (#8231)Richard van der Hoff2020-09-032-17/+39
| * Add an overload for simple_select_one_onecol_txn. (#8235)Patrick Cloke2020-09-021-0/+24
| * Convert runInteraction to async/await (#8156)Patrick Cloke2020-09-021-15/+14
| * Add StreamStore to mypy (#8232)Erik Johnston2020-09-022-18/+62
| * Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-024-70/+205
| * Refactor `_get_e2e_device_keys_for_federation_query_txn` (#8225)Richard van der Hoff2020-09-021-11/+6
| * Add experimental support for sharding event persister. (#8170)Erik Johnston2020-09-027-26/+100
| * Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-021-1/+43
| * Do not try to store invalid data in the stats table (#8226)Patrick Cloke2020-09-021-8/+26
| * Make _get_e2e_device_keys_and_signatures_txn return an attrs (#8224)Richard van der Hoff2020-09-022-20/+40
| * Fix errors when updating the user directory with invalid data (#8223)Patrick Cloke2020-09-011-0/+5
| * Convert additional databases to async/await part 3 (#8201)Patrick Cloke2020-09-016-87/+120
| * Rename `_get_e2e_device_keys_txn` (#8222)Richard van der Hoff2020-09-012-6/+8
| * Convert additional databases to async/await (#8199)Patrick Cloke2020-09-016-137/+146
| * Convert additional databases to async/await part 2 (#8200)Patrick Cloke2020-09-0110-50/+90
| * Make MultiWriterIDGenerator work for streams that use negative stream IDs (#8...Erik Johnston2020-09-011-11/+28
| * Move and rename `get_devices_with_keys_by_user` (#8204)Richard van der Hoff2020-09-013-48/+60
| * Rename `get_e2e_device_keys` to better reflect its purpose (#8205)Richard van der Hoff2020-08-291-14/+6
| * Fix incorrect return signatureAndrew Morgan2020-08-281-1/+1
| * Convert `event_push_actions`, `registration`, and `roommember` datastores to ...Patrick Cloke2020-08-283-160/+168
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-08-2821-364/+510
|\|
| * Only return devices with keys from `/federation/v1/user/devices/` (#8198)Richard van der Hoff2020-08-281-3/+1
| * Convert state and stream stores and related code to async (#8194)Patrick Cloke2020-08-285-44/+49
| * Convert additional database code to async/await. (#8195)Patrick Cloke2020-08-287-157/+221
| * Convert stats and related calls to async/await (#8192)Patrick Cloke2020-08-272-48/+49
| * Convert simple_delete to async/await. (#8191)Patrick Cloke2020-08-273-35/+85
| * Convert calls of async database methods to async (#8166)Patrick Cloke2020-08-2711-74/+103
| * simple_search_list_txn should return None, not 0. (#8187)Patrick Cloke2020-08-271-4/+3
* | Merge branch 'develop' into matrix-org-hotfixesPatrick Cloke2020-08-2738-739/+1122
|\|
| * Fix missing _add_persisted_position (#8179)Erik Johnston2020-08-271-0/+2
| * Convert additional database methods to async (select list, search, insert_man...Patrick Cloke2020-08-275-79/+60
| * Convert simple_update* and simple_select* to async (#8173)Patrick Cloke2020-08-2712-86/+114
| * Make SlavedIdTracker.advance have same interface as MultiWriterIDGenerator (#...Erik Johnston2020-08-261-2/+2
| * Convert simple_select_one and simple_select_one_onecol to async (#8162)Patrick Cloke2020-08-2616-73/+116
| * Add functions to `MultiWriterIdGen` used by events stream (#8164)Erik Johnston2020-08-252-3/+108
| * Make StreamIdGen `get_next` and `get_next_mult` async (#8161)Erik Johnston2020-08-2513-49/+53
| * Wording fixes to 'name' user admin api filter (#8163)Andrew Morgan2020-08-251-1/+1
| * Search in columns 'name' and 'displayname' in the admin users endpoint (#7377)Manuel Stahl2020-08-251-12/+19
| * Don't fail /submit_token requests on incorrect session ID if request_token_in...Brendan Abolivier2020-08-241-6/+19
| * Micro-optimisations to get_auth_chain_ids (#8132)Richard van der Hoff2020-08-211-23/+17
| * Allow denying or shadow banning registrations via the spam checker (#8034)Patrick Cloke2020-08-202-1/+63
| * Be more tolerant of membership events in unknown rooms (#8110)Richard van der Hoff2020-08-201-6/+25
| * Use the JSON encoder without whitespace in more places. (#8124)Patrick Cloke2020-08-205-19/+14
| * Add more types to synapse.storage.database. (#8127)Patrick Cloke2020-08-202-222/+366
| * Do not assume calls to runInteraction return Deferreds. (#8133)Patrick Cloke2020-08-203-22/+26
| * Close the database connection we create during startup (#8131)Richard van der Hoff2020-08-191-1/+10
| * Remove `ChainedIdGenerator`. (#8123)Erik Johnston2020-08-192-86/+18
| * Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-192-6/+17
| * Convert runWithConnection to async. (#8121)Patrick Cloke2020-08-191-14/+13
| * Separate `get_current_token` into two. (#8113)Erik Johnston2020-08-192-11/+29
| * Convert events worker database to async/await. (#8071)Patrick Cloke2020-08-183-75/+88
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-08-181-4/+15
|\|
| * Fix the return type of send_nonmember_events. (#8112)Patrick Cloke2020-08-181-4/+15
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-08-1822-768/+470
|\|
| * Convert some of the general database methods to async (#8100)Patrick Cloke2020-08-175-29/+24
| * Convert stream database to async/await. (#8074)Patrick Cloke2020-08-173-257/+201
| * Add a shadow-banned flag to users. (#8092)Patrick Cloke2020-08-142-1/+26
| * Convert pusher databases to async/await. (#8075)Patrick Cloke2020-08-142-91/+84
| * Convert receipts and events databases to async/await. (#8076)Patrick Cloke2020-08-143-82/+79
| * Remove some unused database functions. (#8085)Patrick Cloke2020-08-146-244/+18
| * Convert misc database code to async (#8087)Patrick Cloke2020-08-1410-64/+38
* | Merge branch 'develop' into matrix-org-hotfixesBrendan Abolivier2020-08-13282-2189/+1948
|\|
| * Convert the roommember database to async/await. (#8070)Patrick Cloke2020-08-123-241/+98
| * Convert devices database to async/await. (#8069)Patrick Cloke2020-08-121-153/+180
| * Convert account data, device inbox, and censor events databases to async/awai...Patrick Cloke2020-08-123-86/+96
| * Convert appservice, group server, profile and more databases to async (#8066)Patrick Cloke2020-08-127-104/+78
| * Merge pull request #8060 from matrix-org/erikj/type_serverErik Johnston2020-08-111-12/+16
| |\
| | * Change HomeServer definition to work with typing.Erik Johnston2020-08-111-12/+16
| * | Convert tags and metrics databases to async/await (#8062)Patrick Cloke2020-08-112-64/+59
| * | Converts event_federation and registration databases to async/await (#8061)Patrick Cloke2020-08-113-164/+125
| |/
| * Implement new experimental push rules (#7997)Brendan Abolivier2020-08-101-4/+12
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-08-06282-1079/+1212
| | |\
| | * | Incorporate reviewBrendan Abolivier2020-08-061-3/+3
| | * | Back out the database hack and replace it with a temporary config settingBrendan Abolivier2020-08-032-47/+9
| | * | Fix cache nameBrendan Abolivier2020-07-311-1/+1
| | * | Fix cache invalidation callsBrendan Abolivier2020-07-311-1/+1
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-07-3019-346/+503
| | |\ \
| | * | | Implement new experimental push rules with a database hack to enable themBrendan Abolivier2020-07-282-5/+51
| * | | | Convert directory, e2e_room_keys, end_to_end_keys, monthly_active_users datab...Patrick Cloke2020-08-075-102/+95
| * | | | Convert additional database stores to async/await (#8045)Patrick Cloke2020-08-074-150/+104
| * | | | Reduce unnecessary whitespace in JSON. (#7372)David Vo2020-08-079-45/+38
| * | | | Revert #7736 (#8039)Brendan Abolivier2020-08-064-151/+2
| * | | | Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-061-3/+2
| | |_|/ | |/| |
| * | | Rename database classes to make some sense (#8033)Erik Johnston2020-08-05282-1075/+1152
| * | | Convert streams to async. (#8014)Patrick Cloke2020-08-041-4/+4
| * | | Prevent join->join membership transitions changing member count (#7977)Andrew Morgan2020-08-032-5/+61
| | |/ | |/|
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-07-3115-340/+470
|\| |
| * | Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-301-1/+1
| |\ \
| | * | Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-291-1/+1
| * | | Convert some of the data store to async. (#7976)Patrick Cloke2020-07-306-188/+160
| * | | Remove from the event_relations table when purging historical events. (#7978)Patrick Cloke2020-07-291-0/+2
| * | | Re-implement unread counts (#7736)Brendan Abolivier2020-07-294-2/+151
| * | | Convert storage layer to async/await. (#7963)Patrick Cloke2020-07-283-140/+145
| * | | Move some log lines from default logger to sql/transaction loggers (#7952)Andrew Morgan2020-07-281-8/+10
| * | | Convert push to async/await. (#7948)Patrick Cloke2020-07-271-2/+2
| |/ /
* | | Merge branch 'release-v1.18.0' into matrix-org-hotfixesRichard van der Hoff2020-07-284-4/+9
|\| |
| * | Convert state resolution to async/await (#7942)Patrick Cloke2020-07-244-4/+9
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-07-2435-234/+484
|\| |
| * | Follow-up to admin API to re-activate accounts (#7908)Patrick Cloke2020-07-221-2/+24
| |/
| * Stop using 'device_max_stream_id' (#7882)Erik Johnston2020-07-172-4/+1
| * Change "unknown room ver" logging to warning. (#7881)Erik Johnston2020-07-171-1/+1
| * Consistently use `db_to_json` to convert from database values to JSON objects...Patrick Cloke2020-07-1621-82/+79
| * Merge pull request #7866 from matrix-org/rav/fix_guest_user_idRichard van der Hoff2020-07-168-59/+183
| |\
| | * Use a postgres sequence to generate guest user IDsRichard van der Hoff2020-07-162-29/+70
| | * Use SequenceGenerator for state group ID allocationRichard van der Hoff2020-07-164-26/+11
| | * Use `PostgresSequenceGenerator` from `MultiWriterIdGenerator`Richard van der Hoff2020-07-161-4/+4
| | * Add some helper classes for generating ID sequencesRichard van der Hoff2020-07-161-0/+98
| * | Avoid brand new rooms in `delete_old_current_state_events` (#7854)Richard van der Hoff2020-07-151-10/+55
| |/
| * remove `retry_on_integrity_error` wrapper for persist_events (#7848)Richard van der Hoff2020-07-151-67/+0
| * Fix bug in per-room message retention policies. (#7850)Patrick Cloke2020-07-141-1/+1
| * Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-141-1/+6
| * Merge branch 'release-v1.17.0' into developRichard van der Hoff2020-07-101-0/+22
| |\
| | * Merge branch 'master' into release-v1.17.0Richard van der Hoff2020-07-101-0/+22
| | |\
| | | * fix migration, againRichard van der Hoff2020-07-101-1/+1
| | | * Drop incorrectly-added table `local_rejections_stream`. (#7816)Richard van der Hoff2020-07-101-0/+22
| * | | Add ability to shard the federation sender (#7798)Erik Johnston2020-07-102-7/+112
| |/ /
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-07-0919-281/+365
|\| |
| * | Generate real events when we reject invites (#7804)Richard van der Hoff2020-07-092-26/+0
| * | Do not use simplejson in Synapse. (#7800)Patrick Cloke2020-07-084-16/+8
| * | Stop populating unused table `local_invites`. (#7793)Richard van der Hoff2020-07-073-80/+24
| * | Refactor getting replication updates from database v2. (#7740)Erik Johnston2020-07-078-149/+322
| * | isort 5 compatibility (#7786)Will Hunt2020-07-053-5/+2
| * | Use symbolic names for replication stream names (#7768)Richard van der Hoff2020-07-012-5/+9
| * | Fix incorrect error message when database CTYPE was set incorrectly. (#7760)Richard van der Hoff2020-07-011-1/+1
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2020-07-012-128/+28
|\|
| * Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-012-128/+28
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-06-254-35/+52
|\|
| * Allow local media to be marked as safe from being quarantined. (#7718)Patrick Cloke2020-06-224-35/+52
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-06-171-1/+1
|\|
| * Fix unread counts in syncBrendan Abolivier2020-06-171-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-06-1724-175/+383
|\|
| * Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-172-27/+127
| |\
| | * Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-1513-81/+62
| | |\
| | * | Incorporate reviewBrendan Abolivier2020-06-151-15/+11
| | * | LintBrendan Abolivier2020-06-121-3/+8
| | * | Incorporate review bitsBrendan Abolivier2020-06-121-14/+13
| | * | Pre-populate the unread_count columnBrendan Abolivier2020-06-121-0/+5
| | * | Don't update the schema versionBrendan Abolivier2020-06-122-1/+1
| | * | Use attr instead of a dictBrendan Abolivier2020-06-121-21/+31
| | * | Fix summary rotationBrendan Abolivier2020-06-121-12/+35