summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
* Log when we delete room in bg update (#6816)Erik Johnston2020-01-301-0/+2
* Backgroud update to clean out rooms from current state (#6802)Erik Johnston2020-01-302-2/+125
* When server leaves room check for stale device lists. (#6801)Erik Johnston2020-01-302-6/+82
* When a client asks for remote keys check if should resync. (#6797)Erik Johnston2020-01-301-3/+29
* Delete current state when server leaves a room (#6792)Erik Johnston2020-01-292-75/+197
* Detect unknown remote devices and mark cache as stale (#6776)Erik Johnston2020-01-282-5/+49
* Warn if postgres database has non-C locale. (#6734)Erik Johnston2020-01-283-0/+52
* Merge branch 'master' into developErik Johnston2020-01-281-1/+7
|\
| * Fix setting `mau_limit_reserved_threepids` config (#6793)Erik Johnston2020-01-281-1/+7
* | Add `rooms.room_version` column (#6729)Erik Johnston2020-01-273-18/+134
* | Propagate cache invalidates from workers to other workers. (#6748)Erik Johnston2020-01-271-1/+21
* | Make 'event.redacts' never raise. (#6771)Erik Johnston2020-01-232-2/+2
* | Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-01-221-1/+1
|/
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-1/+124
* Allow monthly active user limiting support for worker mode, fixes #4639. (#6742)Neil Johnson2020-01-221-82/+83
* Allow streaming cache invalidate all to workers. (#6749)Erik Johnston2020-01-222-9/+36
* Add a DeltaState to track changes to be made to current state (#6716)Erik Johnston2020-01-202-99/+111
* Fix syntax error in run_upgrade for schema 57 (#6728)Satsuki Yanagi2020-01-171-3/+4
* Merge pull request #6714 from matrix-org/babolivier/retention_select_eventBrendan Abolivier2020-01-171-5/+5
|\
| * Fixup diffBrendan Abolivier2020-01-161-6/+7
| * Remove get_room_event_after_stream_ordering entirelyBrendan Abolivier2020-01-161-57/+12
| * LintBrendan Abolivier2020-01-161-6/+12
| * Correctly order when selecting before stream orderingBrendan Abolivier2020-01-151-2/+5
| * Fix typoBrendan Abolivier2020-01-151-1/+1
| * Fix instantiation of message retention purge jobsBrendan Abolivier2020-01-151-12/+47
* | move batch_iter to a separate moduleRichard van der Hoff2020-01-166-6/+6
* | Add StateMap type alias (#6715)Erik Johnston2020-01-163-43/+55
* | Fix purge_room admin API (#6711)Erik Johnston2020-01-151-1/+1
* | Add `local_current_membership` table (#6655)Erik Johnston2020-01-154-80/+238
|/
* Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-131-1/+115
* Refuse to start if sqlite is older than 3.11.0Richard van der Hoff2020-01-092-4/+7
* Check postgres version in check_databaseRichard van der Hoff2020-01-091-13/+12
* Modify check_database to take a connection rather than a cursorRichard van der Hoff2020-01-093-10/+11
* Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-091-0/+2
* Merge pull request #6664 from matrix-org/erikj/media_admin_apisErik Johnston2020-01-081-120/+128
|\
| * Shuffle the codeErik Johnston2020-01-081-25/+16
| * CommentsErik Johnston2020-01-081-0/+3
| * Do not rely on streaming events, as media repo doesn'tErik Johnston2020-01-081-12/+26
| * Move media admin store functions to worker storeErik Johnston2020-01-081-120/+120
* | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-081-2/+2
|/
* Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsBrendan Abolivier2020-01-071-1/+1
|\
| * Fix conditions failing if min_depth = 0Brendan Abolivier2020-01-071-1/+1
* | Add a background update to clear tombstoned rooms from the directory (#6648)Richard van der Hoff2020-01-074-1/+100
* | Async/await for background updates (#6647)Richard van der Hoff2020-01-071-16/+20
* | Merge pull request #6645 from matrix-org/rav/fix_synchrotron_errorRichard van der Hoff2020-01-071-9/+35
|\ \
| * | Clarify documentation on get_event* methodsRichard van der Hoff2020-01-061-9/+35
* | | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesRichard van der Hoff2020-01-061-53/+17
|\ \ \ | |/ / |/| |
| * | Remove unused get_latest_event_ids_and_hashes_in_roomRichard van der Hoff2020-01-061-42/+0
| * | Remove unused get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-30/+0
| * | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ...Richard van der Hoff2020-01-061-0/+35
| * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-2/+3
| |/
* | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-061-2/+2
* | Add experimental 'databases' config (#6580)Erik Johnston2020-01-061-0/+21
|/
* Split state groups into a separate data store (#6296)Erik Johnston2019-12-2023-1157/+1147
* Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-202-2/+2
* Explode on duplicate delta file names. (#6565)Erik Johnston2019-12-191-0/+18
* Improve diagnostics on database upgrade failure (#6570)Richard van der Hoff2019-12-191-1/+4
* Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-181-17/+8
* Add delta file to fix missing default table data (#6555)Andrew Morgan2019-12-183-15/+23
* Add database config class (#6513)Erik Johnston2019-12-186-19/+93
* Automatically delete empty groups/communities (#6453)Werner Sembach2019-12-161-0/+29
* look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-121-4/+213
* Fix redacted events being returned in search results ordered by "recent" (#6522)Andrew Morgan2019-12-121-3/+8
* Merge tag 'v1.7.0rc2' into developErik Johnston2019-12-111-0/+5
|\
| * Merge branch 'erikj/fix_sqlite_7' of github.com:matrix-org/synapse into relea...Erik Johnston2019-12-115-11/+41
| |\
| * | Give the server config to the RoomWorkerStoreBrendan Abolivier2019-12-101-0/+5
* | | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-112-38/+67
* | | Add dev script to generate full SQL schema files (#6394)Andrew Morgan2019-12-112-19/+13
* | | Prevent message search in upgraded rooms we're not in (#6385)Andrew Morgan2019-12-111-5/+13
* | | Fix race which caused deleted devices to reappear (#6514)Richard van der Hoff2019-12-101-3/+5
| |/ |/|
* | Drop unused indexErik Johnston2019-12-104-13/+18
* | Convert _censor_redactions to async since it awaits on coroutinesErik Johnston2019-12-101-11/+9
* | Only start censor background job after indices are createdErik Johnston2019-12-102-2/+9
* | Fix support for SQLite 3.7.Erik Johnston2019-12-093-2/+22
|/
* Merge pull request #6487 from matrix-org/erikj/pass_in_dbErik Johnston2019-12-0929-122/+162
|\
| * Fix commentErik Johnston2019-12-091-1/+1
| * Fix port db scriptErik Johnston2019-12-061-1/+1
| * Move start up DB checks to main data store.Erik Johnston2019-12-061-0/+7
| * Pass Database into the data storeErik Johnston2019-12-064-26/+23
| * Move are_all_users_on_domain checks to main data store.Erik Johnston2019-12-062-13/+23
| * Change DataStores to accept 'database' param.Erik Johnston2019-12-0625-82/+108
* | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-092-3/+3
|\ \ | |/ |/|
| * Fixup functions to consistently return deferredsErik Johnston2019-12-062-3/+3
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab...Erik Johnston2019-12-063-47/+71
|\ \
| * | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-053-44/+71
| |/
* | Remove unused varErik Johnston2019-12-061-2/+0
* | Move background update handling out of storeErik Johnston2019-12-0517-146/+163
* | CommentsErik Johnston2019-12-053-5/+16
* | Move DB pool and helper functions into dedicated Database classErik Johnston2019-12-0544-2192/+2271
|/
* Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseErik Johnston2019-12-0543-507/+508
|\
| * Remove underscore from SQLBaseStore functionsErik Johnston2019-12-0443-500/+492
| * Don't call SQLBaseStore methods from outside storesErik Johnston2019-12-042-8/+17
* | Merge pull request #6470 from matrix-org/babolivier/port_db_ci_failureBrendan Abolivier2019-12-041-2/+10
|\ \
| * | Fix background updates for synapse_port_dbBrendan Abolivier2019-12-041-2/+10
| |/
* / get rid of (most of) have_events from _update_auth_events_and_context_for_aut...Richard van der Hoff2019-12-041-34/+0
|/
* Merge pull request #6454 from matrix-org/erikj/clean_base_StoreErik Johnston2019-12-047-190/+218
|\
| * Revert "Move get_user_count_txn out of base store"Erik Johnston2019-12-042-12/+12
| * _CURRENT_STATE_CACHE_NAME is publicErik Johnston2019-12-041-3/+3
| * Move get_user_count_txn out of base storeErik Johnston2019-12-042-12/+12
| * Move cache invalidation to main data storeErik Johnston2019-12-045-112/+141
| * Move event fetch vars to EventWorkStoreErik Johnston2019-12-044-14/+15
| * Move account validity bg updates to registration storeErik Johnston2019-12-042-66/+64
* | Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-041-0/+3
|\ \ | |/ |/|
| * Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0422-305/+1024
| |\
| * | Update copyrightsBrendan Abolivier2019-11-051-0/+3
* | | Merge pull request #6451 from matrix-org/uhoreg/cross_signing_signatures_indexErik Johnston2019-12-042-1/+24
|\ \ \
| * | | apply changes from reviewHubert Chathi2019-12-031-1/+2
| * | | make cross signing signature index non-uniqueHubert Chathi2019-12-022-1/+23
| | |/ | |/|
* | | Fix exception when a cross-signed device is deleted (#6462)Richard van der Hoff2019-12-041-4/+19
* | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-032-6/+141
|/ /
* | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-281-0/+13
* | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-272-66/+177
* | Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-2618-239/+547
|\ \
| * | Don't construct a setErik Johnston2019-11-261-6/+3
| * | Fix find_next_generated_user_id_localpartErik Johnston2019-11-261-10/+7
| * | Prevent account_data content from being sent over TCP replication (#6333)Andrew Morgan2019-11-261-3/+3
| |\ \
| | * | Remove content from being sent for account data rdata streamAndrew Morgan2019-11-081-3/+3
| * | | Make sure that we close cursors before returning from a query (#6408)Richard van der Hoff2019-11-252-10/+43
| * | | Merge tag 'v1.6.0rc2' into developRichard van der Hoff2019-11-251-18/+25
| |\ \ \
| | * | | Fix exceptions from background database update for event labels. (#6407)Richard van der Hoff2019-11-251-18/+25
| * | | | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-2110-22/+16
| |/ / /
| * | | Replace UPDATE with UPSERT on device_max_stream_id table (#6363)Andrew Morgan2019-11-151-2/+15
| * | | Fix guest -> real account upgrade with account validity enabled (#6359)Andrew Morgan2019-11-141-6/+3
| |/ /
| * | Merge pull request #6340 from matrix-org/babolivier/pagination_queryBrendan Abolivier2019-11-081-8/+32
| |\ \
| | * | Incorporate reviewBrendan Abolivier2019-11-081-12/+12
| | * | LintBrendan Abolivier2019-11-071-2/+2
| | * | Only join on event_labels if we're filtering on labelsBrendan Abolivier2019-11-071-9/+24
| | * | Handle lack of filterBrendan Abolivier2019-11-071-5/+3
| | * | Fix the SQL SELECT query in _paginate_room_events_txnBrendan Abolivier2019-11-071-2/+13
| * | | Merge pull request #6295 from matrix-org/erikj/split_purge_historyErik Johnston2019-11-084-172/+319
| |\ \ \
| | * | | Move type annotation into docstringErik Johnston2019-11-081-3/+3
| | * | | Fix deleting state groups during room purge.Erik Johnston2019-11-061-13/+14
| | * | | Use correct type annotationErik Johnston2019-11-061-2/+2
| | * | | Change to not require a state_groups.room_id index.Erik Johnston2019-11-044-53/+45
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-0418-54/+259
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Fix up commentErik Johnston2019-11-011-2/+1
| | * | | Update log line to lie a little lessErik Johnston2019-10-311-1/+1
| | * | | Add state_groups.room_id indexErik Johnston2019-10-312-0/+24
| | * | | DocstringsErik Johnston2019-10-311-3/+11
| | * | | Fix purge room APIErik Johnston2019-10-311-5/+8
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-10-317-12/+243
| | |\ \ \
| | * | | | Split purge API into events vs stateErik Johnston2019-10-304-175/+295
| * | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_updateBrendan Abolivier2019-11-072-0/+80
| |\ \ \ \ \
| | * | | | | Update synapse/storage/data_stores/main/events_bg_updates.pyBrendan Abolivier2019-11-071-1/+1
| | * | | | | Update synapse/storage/data_stores/main/events_bg_updates.pyBrendan Abolivier2019-11-071-1/+1
| | * | | | | Copy resultsBrendan Abolivier2019-11-071-1/+3
| | * | | | | Revert "Back to using cursor_to_dict"Brendan Abolivier2019-11-071-9/+9
| | * | | | | Back to using cursor_to_dictBrendan Abolivier2019-11-071-9/+9
| | * | | | | Initialise value before loopingBrendan Abolivier2019-11-071-4/+8
| | * | | | | Incorporate reviewBrendan Abolivier2019-11-071-14/+9
| | * | | | | Fix field nameBrendan Abolivier2019-11-061-1/+1
| | * | | | | Update insertBrendan Abolivier2019-11-061-1/+6
| | * | | | | Print out the actual number of affected rowsBrendan Abolivier2019-11-041-4/+4
| | * | | | | Correctly order resultsBrendan Abolivier2019-11-041-5/+5
| | * | | | | TODOBrendan Abolivier2019-11-041-0/+2
| | * | | | | Fix exit conditionBrendan Abolivier2019-11-041-1/+3
| | * | | | | LintBrendan Abolivier2019-11-041-6/+3
| | * | | | | Don't try to process events we already have a label forBrendan Abolivier2019-11-041-1/+2
| | * | | | | Use a sensible default value for labelsBrendan Abolivier2019-11-041-1/+1
| | * | | | | Use the right format for rowsBrendan Abolivier2019-11-041-1/+1
| | * | | | | MSC2326: Add background update to take previous events into accountBrendan Abolivier2019-11-042-0/+72
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groupsAndrew Morgan2019-11-072-1/+20
| |\ \ \ \ \
| | * | | | | Re-add docstring, with caveats detailedAndrew Morgan2019-11-042-2/+6
| | * | | | | Transfer upgraded rooms on groupsAndrew Morgan2019-11-041-0/+15
| | |/ / / /
| * | | | / Numeric ID checker now checks @0, don't ratelimit on checkingAndrew Morgan2019-11-061-4/+4
| | |_|_|/ | |/| | |
| * | | | Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-061-1/+1
| |/ / /
* | | | Fix worker modeBrendan Abolivier2019-11-191-56/+56
* | | | LintBrendan Abolivier2019-11-191-25/+24
* | | | Implement per-room message retention policiesBrendan Abolivier2019-11-043-0/+288
|/ / /
* | | Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-013-2/+75
|\ \ \
| * | | Incorporate reviewBrendan Abolivier2019-11-012-1/+7
| * | | Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sqlBrendan Abolivier2019-11-011-1/+1
| * | | Add more data to the event_labels table and fix the indexesBrendan Abolivier2019-11-013-5/+21
| * | | LintBrendan Abolivier2019-11-011-1/+1
| * | | Incorporate reviewBrendan Abolivier2019-11-011-2/+10
| * | | LintBrendan Abolivier2019-10-301-7/+1
| * | | Add more integration testingBrendan Abolivier2019-10-301-1/+1
| * | | Add index on labelBrendan Abolivier2019-10-301-1/+3
| * | | Implement filteringBrendan Abolivier2019-10-301-0/+9
| * | | Store labels for new eventsBrendan Abolivier2019-10-301-1/+19
| * | | Add database table for keeping track of labels on eventsBrendan Abolivier2019-10-291-0/+20
* | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schemaHubert Chathi2019-11-011-0/+42
|\ \ \ \
| * | | | fix hidden field in devices table for older sqliteHubert Chathi2019-10-311-0/+42
* | | | | Update synapse/storage/data_stores/main/devices.pyHubert Chathi2019-10-311-1/+1
* | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3119-40/+300
|\| | | |
| * | | | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-3118-39/+272
| |\ \ \ \
| | * | | | Update black to 19.10b0 (#6304)Amber Brown2019-11-0113-27/+29
| | | |_|/ | | |/| |
| | * | | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-313-1/+236
| | |\ \ \
| | | * | | Apply suggestions from code review Erik Johnston2019-10-311-1/+2
| | | * | | Add StateGroupStorage interfaceErik Johnston2019-10-303-1/+235
| | | | |/ | | | |/|
| | * | | Fix /purge_room API.Erik Johnston2019-10-311-1/+0
| | * | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-313-5/+5
| | * | | fix delete_existing for _persist_events (#6300)Richard van der Hoff2019-10-302-5/+2
| | |/ /
| * | | make user signatures a separate streamHubert Chathi2019-10-302-12/+25
| * | | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-3013-724/+889
| |\| |
| * | | make notification of signatures work with workersHubert Chathi2019-10-242-2/+16
* | | | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-301-4/+4
* | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3012-657/+822
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-3012-84/+126
| |\ \ \
| | * | | Port receipt and read markers to async/waitErik Johnston2019-10-291-4/+3
| | | |/ | | |/|
| | * | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsErik Johnston2019-10-291-1/+1
| | |\ \
| | | * | Quick fix to ensure cache descriptors always return deferredsErik Johnston2019-10-281-1/+1
| | * | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-291-4/+8
| | |\ \ \
| | | * | | Make room directory search case insensitiveErik Johnston2019-10-291-4/+8
| | * | | | Add CI for synapse_port_db (#6140)Brendan Abolivier2019-10-281-3/+6
| | | |/ / | | |/| |
| | * | | Convert EventContext to attrs (#6218)Richard van der Hoff2019-10-281-1/+6
| | * | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysHubert Chathi2019-10-252-0/+33
| | |\ \ \
| | | * | | delete keys when deleting backupsHubert Chathi2019-10-242-0/+33
| | | | |/ | | | |/|
| | * | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-251-67/+67
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix /keys/query API on workers.Erik Johnston2019-10-251-67/+67
| | | |/
| | * | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingErik Johnston2019-10-251-3/+1
| | |\ \
| | | * | Address codestyle concernsMichael Kaye2019-10-241-3/+1
| | | * | use %r to __repr__ objectsMichael Kaye2019-10-241-1/+1
| | | |/
| | * / Make user/room stats log line less verbose.Michael Kaye2019-10-241-1/+1
| | |/
| * | Review commentsErik Johnston2019-10-303-10/+26
| * | Add DataStores and Storage classes.Erik Johnston2019-10-233-4/+34
| * | Move persist_events out from main data store.Erik Johnston2019-10-232-634/+711
* | | apply changes as a result of PR reviewHubert Chathi2019-10-301-43/+36
* | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-24241-4341/+4597
|\ \ \ | | |/ | |/|
| * | Move schema delta files to the correct data store.Erik Johnston2019-10-242-0/+0
| |/
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-221-11/+37
| |\
| * | Clean up prepare_database.py a bit and add commentsErik Johnston2019-10-221-7/+30
| * | Delete background_update table creation in main data_storeErik Johnston2019-10-221-21/+0
| * | Move README into synapse/storage/__init__.pyErik Johnston2019-10-222-13/+12
| * | Add a basic README to synapse.storageErik Johnston2019-10-221-0/+13
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-226-12/+337
| |\ \
| * | | Fix schema management to work with multiple data stores.Erik Johnston2019-10-211-41/+108
| * | | Move storage classes into a main "data store".Erik Johnston2019-10-21239-4292/+4466
* | | | move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with wor...Hubert Chathi2019-10-231-67/+67
* | | | vendor-prefix the EDU name until MSC1756 is merged into the specHubert Chathi2019-10-221-1/+2
* | | | update to work with newer code, and fix formattingHubert Chathi2019-10-221-1/+1
* | | | make black happyHubert Chathi2019-10-221-22/+32
* | | | don't crash if the user doesn't have cross-signing keysHubert Chathi2019-10-221-14/+25
* | | | implement federation parts of cross-signingHubert Chathi2019-10-221-5/+51
| |_|/ |/| |
* | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1838-908/+1949
|\ \ \ | | |/ | |/|
| * | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1838-903/+1945
| |\|
| | * Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-111-4/+14
| | |\
| | | * expand on commentHubert Chathi2019-10-111-1/+2
| | | * make sure we actually return somethingHubert Chathi2019-10-101-2/+4
| | | * make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-101-2/+9
| | * | Fix MAU reaping where reserved users are specified. (#6168)Neil Johnson2019-10-111-39/+62
| | * | Merge pull request #6156 from matrix-org/erikj/postgres_anyErik Johnston2019-10-1014-109/+189
| | |\ \
| | | * | Fix SQLite take 2Erik Johnston2019-10-101-1/+1
| | | * | Fix SQLiteErik Johnston2019-10-101-1/+1
| | | * | Remove add_in_list_sql_clauseErik Johnston2019-10-104-34/+25
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_anyErik Johnston2019-10-101-3/+4
| | | |\ \
| | | * | | Replace IN usage with helper funcsErik Johnston2019-10-1011-97/+138
| | | * | | Add helper funcs to use postgres ANYErik Johnston2019-10-101-8/+56
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq...Erik Johnston2019-10-101-3/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-102-35/+61
| | | |\| |