summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Check redaction state when event is pulled out of the databaseErik Johnston2019-01-291-0/+13
* | Fix typoErik Johnston2019-01-291-1/+1
* | Remove unused argErik Johnston2019-01-291-2/+1
* | Update synapse/storage/events_worker.pyRichard van der Hoff2019-01-291-1/+1
* | Implement rechecking of redactionsErik Johnston2019-01-291-1/+25
|/
* Fix typo in upserts code (#4505)Amber Brown2019-01-291-1/+1
* Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-283-12/+20
* Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-282-10/+9
|\
| * Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-251-6/+2
| |\
| | * Replace missed usages of FrozenEventErik Johnston2019-01-251-6/+2
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_nat...Erik Johnston2019-01-252-2/+25
| |\ \
| | * | Don't require sqlite3 when using postgres (#4466)Andrew Morgan2019-01-251-2/+1
| * | | Disable native upserts for sqlite, as they don't workErik Johnston2019-01-251-3/+7
| | |/ | |/|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-2512-64/+334
|\ \ \ | | |/ | |/|
| * | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-251-0/+24
| |\ \ | | |/ | |/|
| | * Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synap...Andrew Morgan2019-01-241-1/+1
| | |\
| | | * Apply suggestions from code reviewRichard van der Hoff2019-01-241-1/+1
| | * | Remove redundant create event None checkAndrew Morgan2019-01-241-3/+0
| | |/
| | * Do not return in a deferred functionAndrew Morgan2019-01-221-3/+3
| | * Ensure new filter is actually createdAndrew Morgan2019-01-221-1/+0
| | * Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-221-1/+28
| | * Search for messages across predecessor roomsAndrew Morgan2019-01-181-0/+1
| * | Revert "Require event format version to parse or create events"Erik Johnston2019-01-251-2/+6
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_fo...Erik Johnston2019-01-248-33/+238
| |\ \
| | * \ Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-241-4/+4
| | |\ \
| | | * | Use term 'out of band membership' insteadErik Johnston2019-01-241-3/+3
| | * | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-243-4/+32
| | |\ \ \
| | * | | | Fix UPSERT check (#4459)Amber Brown2019-01-241-5/+28
| | * | | | Use native UPSERTs where possible (#4306)Amber Brown2019-01-247-30/+212
| * | | | | Replace missed usages of FrozenEventErik Johnston2019-01-241-6/+2
| * | | | | Merge branch 'erikj/fixup_rejecting_invites' of github.com:matrix-org/synapse...Erik Johnston2019-01-231-4/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Clarify the invite flowsErik Johnston2019-01-231-4/+7
| | * | | | Store rejected remote invite events as outliersErik Johnston2019-01-231-4/+1
| | |/ / /
| * | / / Merge branch 'erikj/get_pdu_versions' into erikj/require_format_versionErik Johnston2019-01-231-1/+5
| |\| | | | | |/ / | |/| |
| | * | Fixup removal of duplicate `user_ips` rows (#4432)Erik Johnston2019-01-231-1/+5
| * | | isortErik Johnston2019-01-231-1/+1
| * | | Add support for persisting event format versionsErik Johnston2019-01-233-4/+32
| |/ /
| * | Refactor to rewrite the SQL insteadErik Johnston2019-01-221-13/+16
| * | Don't shadow paramsErik Johnston2019-01-221-4/+3
| * | Fix bug when removing duplicate rows from user_ipsErik Johnston2019-01-221-13/+20
* | | Fix typosAndrew Morgan2019-01-221-1/+1
|/ /
* / Fix race when persisting create event (#4404)Erik Johnston2019-01-181-1/+12
|/
* Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-122-4/+160
* Fix adding new rows instead of updating them if one of the key values is a NU...Amber Brown2019-01-091-1/+9
* Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-021-25/+25
* Log roomid along with Unknown room (#4297)Will Hunt2018-12-241-1/+1
* create support user (#4141)Neil Johnson2018-12-143-4/+83
* Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-1/+1
* Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-7/+13
* drop undocumented dependency on dateutil (#4266)Richard van der Hoff2018-12-061-7/+6
* Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-041-0/+6
* add more detail to logging regarding "More than one row matched" error (#4234)Ben Parsons2018-12-041-6/+6
* Fix UnicodeDecodeError when postgres is not configured in english (#4253)Richard van der Hoff2018-12-041-7/+8
* Drop sent_transactionsAaron Raimist2018-12-016-74/+3
* Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-281-2/+3
* Ignore __pycache__ directories in schema delta dirRichard van der Hoff2018-11-201-1/+1
* Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-151-34/+40
* Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a...David Baker2018-11-098-65/+274
|\
| * Lets convert bytes to unicode insteadErik Johnston2018-11-081-5/+3
| * Fix noop checks when updating device keysErik Johnston2018-11-081-0/+5
| * Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-062-6/+6
| * Add unique indexes to a couple of tablesRichard van der Hoff2018-11-023-6/+88
| * Remove redundant database locks for device list updatesRichard van der Hoff2018-11-021-5/+40
| * Merge pull request #4006 from matrix-org/erikj/purge_state_groupsErik Johnston2018-10-304-48/+137
| |\
| | * Move _find_unreferenced_groupsErik Johnston2018-10-292-81/+83
| | * Fix set operations thinkoErik Johnston2018-10-291-3/+4
| | * Don't make temporary listErik Johnston2018-10-291-3/+2
| | * Make SQL a bit cleanerErik Johnston2018-10-291-3/+2
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-2610-379/+635
| | |\
| | * | pep8Erik Johnston2018-10-191-1/+1
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-196-56/+461
| | |\ \
| | * | | Batch process handling state groupsErik Johnston2018-10-192-101/+92
| | * | | Fix up commentsErik Johnston2018-10-121-3/+3
| | * | | Add state_group index to event_to_state_groupsErik Johnston2018-10-043-1/+27
| | * | | Delete unreferened state groups during purgeErik Johnston2018-10-042-6/+77
* | | | | pep8David Baker2018-11-091-1/+2
* | | | | add docsDavid Baker2018-11-091-1/+4
* | | | | Cast to int here tooDavid Baker2018-10-301-0/+5
* | | | | Cast bacjup version to int when queryingDavid Baker2018-10-301-1/+6
* | | | | Convert version back to a stringDavid Baker2018-10-301-0/+1
* | | | | Try & make it work on postgresDavid Baker2018-10-301-2/+2
* | | | | Make e2e backup versions numeric in the DBDavid Baker2018-10-292-1/+54
|/ / / /
* | | | Deduplicate device updates sent over replicationErik Johnston2018-10-291-1/+5
* | | | preserve room visibilityRichard van der Hoff2018-10-251-1/+1
| |_|/ |/| |
* | | Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-252-327/+520
* | | Merge pull request #4081 from matrix-org/neilj/fix_mau_initNeil Johnson2018-10-252-23/+83
|\ \ \
| * | | add new lineNeil Johnson2018-10-251-0/+1
| * | | improve commentsNeil Johnson2018-10-251-6/+6
| * | | fix style inconsistenciesNeil Johnson2018-10-242-15/+47
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_initNeil Johnson2018-10-242-22/+25
| |\ \ \
| * | | | remove white spaceNeil Johnson2018-10-231-2/+1
| * | | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-232-17/+45
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-2512-51/+423
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-241-1/+1
| |\ \ \ \
| | * | | | Fix a number of flake8 errorsRichard van der Hoff2018-10-241-1/+1
| | |/ / /
| * | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-241-21/+24
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update event_auth table for rejected eventsErik Johnston2018-10-161-15/+21
| | * | | Add v2 state res algorithm.Erik Johnston2018-10-161-6/+3
| * | | | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-205-6/+6
| | |_|/ | |/| |
| * | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-161-22/+16
| |/ /
| * | Merge pull request #4019 from matrix-org/dbkr/e2e_backupsDavid Baker2018-10-153-0/+361
| |\ \
| | * | Misc PR feedback bitsDavid Baker2018-10-121-2/+2
| | * | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-0916-116/+330
| | |\ \
| | * | | Don't reuse backup versionsDavid Baker2018-10-052-3/+9
| | * | | WIP e2e key backupsDavid Baker2018-09-131-0/+0
| | * | | try to make flake8 and isort happyHubert Chathi2018-09-061-2/+4
| | * | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-2414-195/+674
| | |\ \ \
| | * | | | allow session_data to be any JSON instead of just a stringHubert Chathi2018-08-211-2/+4
| | * | | | allow auth_data to be any JSON instead of a stringHubert Chathi2018-08-211-2/+5
| | * | | | missing importMatthew Hodgson2018-08-121-0/+1
| | * | | | 404 nicely if you try to interact with a missing current versionMatthew Hodgson2018-08-121-16/+35
| | * | | | flake8Matthew Hodgson2018-08-121-1/+1
| | * | | | implement remaining tests and make them workMatthew Hodgson2018-08-121-1/+2
| | * | | | fix idiocies and so make tests passMatthew Hodgson2018-08-122-3/+4
| | * | | | don't needlessly return user_idMatthew Hodgson2018-08-121-1/+0
| | * | | | fix flakesMatthew Hodgson2018-08-121-2/+4
| | * | | | fix typosMatthew Hodgson2018-08-121-1/+1
| | * | | | add a tonne of docstring; make upload_room_keys properly assert versionMatthew Hodgson2018-08-121-20/+31
| | * | | | add storage docstring; remove unused set_e2e_room_keysMatthew Hodgson2018-08-121-36/+83
| | * | | | rename room_key_version table correctly, and fix opt argsMatthew Hodgson2018-08-121-13/+13
| | * | | | blindly incorporate PR review - needs testing & fixingMatthew Hodgson2018-08-122-46/+31
| | * | | | make /room_keys/version workMatthew Hodgson2018-08-122-7/+19
| | * | | | implement /room_keys/version too (untested)Matthew Hodgson2018-08-122-1/+57
| | * | | | make it work and fix pep8Matthew Hodgson2018-08-123-43/+64
| | * | | | interim WIP checkin; doesn't build yetMatthew Hodgson2018-08-121-0/+20
| | * | | | total WIP skeleton for /room_keys APIMatthew Hodgson2018-08-122-0/+173
| * | | | | Comments on get_all_new_events_streamRichard van der Hoff2018-10-121-1/+15
| | |_|/ / | |/| | |
* | | | | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-042-34/+91
|\| | | |
| * | | | actually exclude outliersRichard van der Hoff2018-10-031-1/+2
| * | | | remove debuggingRichard van der Hoff2018-10-021-10/+0
| * | | | Fix bug in forward_extremity update logicRichard van der Hoff2018-10-021-33/+78
| | |_|/ | |/| |
| * | | Fix bug when invalidating destination retry timingsErik Johnston2018-10-021-1/+1
| * | | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-282-9/+26
| |\ \ \
| * | | | Add a five minute cache to get_destination_retry_timingsErik Johnston2018-09-211-1/+22
* | | | | fix thinkosMatthew Hodgson2018-09-291-1/+1
| |/ / / |/| | |
* | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upsertsRichard van der Hoff2018-09-271-1/+4
|\ \ \ \
| * | | | fix #3854Neil Johnson2018-09-261-1/+4
| |/ / /
* / / / docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-271-8/+22
|/ / /
* | | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-201-15/+19
* | | Fix up changelog and remove spurious commentErik Johnston2018-09-191-2/+0
* | | pep8Erik Johnston2018-09-191-1/+0
* | | Remove get_destination_retry_timings cacheErik Johnston2018-09-191-5/+0
* | | Return a 404 when deleting unknown room aliasRichard van der Hoff2018-09-171-1/+0
* | | commentErik Johnston2018-09-131-0/+2
* | | pep8Erik Johnston2018-09-131-1/+0
* | | Create indices after insertionErik Johnston2018-09-131-14/+18
* | | Make purge history slightly fasterErik Johnston2018-09-131-2/+9
* | | Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7Neil Johnson2018-09-121-0/+17
|\ \ \
| * | | improve namingNeil Johnson2018-09-121-1/+1
| * | | expose number of real reserved usersNeil Johnson2018-09-121-0/+17
* | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyringAmber Brown2018-09-121-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | clearer logging when things fail, tooRichard van der Hoff2018-09-061-0/+1
* | | | Speed up lazy loading (#3827)Matthew Hodgson2018-09-122-0/+69
* | | | ensure guests never enter mau listNeil Johnson2018-09-061-4/+3
* | | | guest users should not be part of mau totalNeil Johnson2018-09-051-1/+6
|/ / /
* | | move threepid checker to config, add missing yieldsNeil Johnson2018-08-311-14/+0
* | | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-311-1/+14
* | | Port storage/ to Python 3 (#3725)Amber Brown2018-08-3110-31/+74
| |/ |/|
* | Implement trail usersErik Johnston2018-08-232-1/+32
* | Add missing yieldErik Johnston2018-08-231-1/+2
* | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-222-31/+31
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-179-134/+217
| |\ \
| * | | Remote profile cache should remain in master workerErik Johnston2018-08-171-4/+2
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-097-34/+272
| |\ \ \
| * | | | Allow ratelimiting on workersErik Johnston2018-08-071-29/+29
| * | | | Allow profile changes to happen on workersErik Johnston2018-08-071-2/+4
| | |_|/ | |/| |
* | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-221-1/+3
|\ \ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-209-134/+217
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Choose state algorithm based on room versionErik Johnston2018-08-091-1/+3
| | |_|/ | |/| |
* | | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-221-17/+141
| |/ / |/| |
* | | call reap on start up and fix under reaping bugNeil Johnson2018-08-161-1/+4
* | | initial cut at a room summary API (#3574)Matthew Hodgson2018-08-163-8/+8
* | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-152-3/+65
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-154-24/+41
|\ \ \
| * | | adding missing yieldNeil Johnson2018-08-141-1/+1
| * | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-141-5/+5
| |\ \ \
| | * | | rename _user_last_seen_monthly_activeNeil Johnson2018-08-091-5/+5
| | |/ /
| * | | Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po...Amber Brown2018-08-141-0/+5
| |\ \ \
| | * | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-131-0/+5
| * | | | fix sqlite/postgres incompatibility in reap_monthly_active_usersNeil Johnson2018-08-111-16/+28
| |/ / /
| * / / Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-102-2/+2
| |/ /
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-097-34/+272
|\| |
| * | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-081-3/+30
| |\ \
| | * | Basic support for room versioningRichard van der Hoff2018-08-031-3/+30
| | |/
| * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u...Neil Johnson2018-08-083-5/+10
| |\ \
| | * \ Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-085-28/+195
| | |\ \
| | | * | typosNeil Johnson2018-08-082-3/+3
| | * | | Fix occasional glitches in the synapse_event_persisted_position metricRichard van der Hoff2018-08-071-3/+8
| | | |/ | | |/|
| * | | prevent total number of reserved users being too largeNeil Johnson2018-08-071-1/+3
| * | | implement reserved users for mau limitsNeil Johnson2018-08-071-11/+34
| * | | WIP building out mau reserved usersNeil Johnson2018-08-061-1/+15
| | |/ | |/|
| * | Fix postgres compatibility bugNeil Johnson2018-08-061-4/+15
| * | make use of _simple_select_one_onecol, improved commentsNeil Johnson2018-08-062-8/+15
| * | bug fixesNeil Johnson2018-08-031-2/+1
| * | wip commit - tests failingNeil Johnson2018-08-032-38/+49
| * | fix caching and testsNeil Johnson2018-08-031-48/+43
| * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-033-8/+27
| |\|
| * | typoNeil Johnson2018-08-021-1/+1
| * | wip attempt at cachingNeil Johnson2018-08-021-9/+47
| * | do mau checks based on monthly_active_users tableNeil Johnson2018-08-021-7/+8
| * | remove unused count_monthly_usersNeil Johnson2018-08-021-25/+0
| * | insertion into monthly_active_usersNeil Johnson2018-08-023-7/+35
| * | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-022-1/+3
| |\ \
| | * | self.db_conn unusedNeil Johnson2018-08-011-1/+0
| | * | normalise reaping queryNeil Johnson2018-08-011-3/+38
| * | | Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-022-4/+10
| |/ /
| * | change monthly_active_users table to be a single columnNeil Johnson2018-08-012-10/+4
| * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-017-11/+47
| |\ \
| * | | clean upNeil Johnson2018-08-011-15/+3
| * | | fix commentNeil Johnson2018-08-011-1/+1
| * | | api into monthly_active_users tableNeil Johnson2018-07-314-2/+114
* | | | Pull in necessary stores in federation_readerErik Johnston2018-08-061-1/+0
* | | | Move necessary storage functions to worker classesErik Johnston2018-08-063-98/+100
| |_|/ |/| |
* | | Merge branch 'master' into developRichard van der Hoff2018-08-022-6/+15
|\ \ \
| * | | Avoid extra db lookupsRichard van der Hoff2018-08-022-35/+15
| * | | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-021-0/+29
* | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-021-2/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | update docsErik Johnston2018-08-011-1/+1
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_...Erik Johnston2018-07-3011-67/+225
| |\ \ \ | | | |/ | | |/|
| * | | Split out DB writes in federation handlerErik Johnston2018-07-251-2/+12
* | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-012-1/+27
|\ \ \ \
| * | | | improve clarityNeil Johnson2018-08-011-4/+5
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-016-6/+10
| |\ \ \ \
| * | | | | remove errant printNeil Johnson2018-08-011-1/+0
| * | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-011-13/+13
| * | | | | coding styleNeil Johnson2018-07-312-3/+2
| * | | | | actually close connNeil Johnson2018-07-301-4/+8
| * | | | | factor out metrics from __init__ to app/homeserverNeil Johnson2018-07-301-24/+13
| * | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-301-0/+34
| | |_|/ / | |/| | |
* | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-022-5/+11
| |/ / / |/| | |
* | | | Merge pull request #3612 from matrix-org/rav/store_heirarchyRichard van der Hoff2018-07-316-6/+10
|\ \ \ \ | |/ / / |/| | |
| * | | reinstate explicit include of EventsWorkerStoreRichard van der Hoff2018-07-311-1/+3
| * | | Make EventStore inherit from EventFederationStoreRichard van der Hoff2018-07-266-7/+9
* | | | make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-271-3/+11
* | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_contentRichard van der Hoff2018-07-263-2/+98
|\ \ \ \
| * | | | Create the column nullableRichard van der Hoff2018-07-262-9/+13
| * | | | Stop populating events.contentRichard van der Hoff2018-07-262-1/+93
* | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_idRichard van der Hoff2018-07-262-8/+6
|\ \ \ \ \
| * | | | | Remove some redundant joins on event_edges.room_idRichard van der Hoff2018-07-262-8/+6
| |/ / / /
* | | | | Merge pull request #3610 from matrix-org/rav/fix_looping_callsRichard van der Hoff2018-07-265-6/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-265-6/+8
| |/ / /
* / / / comment on event_edgesRichard van der Hoff2018-07-261-1/+2
|/ / /
* | | switch missing_types to be a boolMatthew Hodgson2018-07-251-4/+4
* | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-258-125/+187
|\| |
| * | Merge pull request #3603 from matrix-org/erikj/handle_outliersErik Johnston2018-07-251-6/+8
| |\ \
| | * | Actually fix it by adding continueErik Johnston2018-07-251-0/+1
| | * | Fix typo in conditionalErik Johnston2018-07-251-1/+1
| | * | Correctly handle outliers during persist eventsErik Johnston2018-07-251-6/+7
| * | | Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_moreRichard van der Hoff2018-07-252-5/+10
| |\ \ \
| | * | | Fix another logcontext leak in _persist_eventsRichard van der Hoff2018-07-252-5/+10
| | |/ /