summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * | 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
| | | |\| |
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-0923-706/+1180
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Patch inlinecallbacks for log contextsErik Johnston2019-09-272-4/+5
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq...Erik Johnston2019-10-1016-725/+1030
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-101-9/+29
| | | * | | Rewrite the user_filter migration again (#6184)Richard van der Hoff2019-10-101-26/+32
| | | | |/ | | | |/|
| | | * | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsErik Johnston2019-10-092-4/+28
| | | |\ \
| | | * | | Fix RegistrationStoreBrendan Abolivier2019-10-081-1/+1
| | | * | | Cleanup client_ipsBrendan Abolivier2019-10-081-7/+0
| | | * | | Don't end up with 4 classes in registrationBrendan Abolivier2019-10-081-52/+50
| | | * | | LintBrendan Abolivier2019-10-073-3/+3
| | | * | | Move roommember's bg updates to a dedicated storeBrendan Abolivier2019-10-071-108/+114
| | | * | | Move user_directory's bg updates to a dedicated storeBrendan Abolivier2019-10-071-84/+94
| | | * | | Move state's bg updates to a dedicated storeBrendan Abolivier2019-10-071-190/+204
| | | * | | Move search's bg updates to a dedicated storeBrendan Abolivier2019-10-071-25/+31
| | | * | | Move registration's bg updates to a dedicated storeBrendan Abolivier2019-10-071-95/+103
| | | * | | Move media_repository's bg updates to a dedicated storeBrendan Abolivier2019-10-071-3/+9
| | | * | | Move devices's bg updates to a dedicated storeBrendan Abolivier2019-10-071-22/+27
| | | * | | Move deviceinbox's bg updates to a dedicated storeBrendan Abolivier2019-10-071-15/+22
| | | * | | Move client_ips's bg updates to a dedicated storeBrendan Abolivier2019-10-071-94/+106
| | | * | | add some logging to the rooms stats updates, to try to track down a flaky tes...Richard van der Hoff2019-10-071-0/+3
| | | * | | Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_indexBrendan Abolivier2019-10-071-2/+2
| | | |\ \ \
| | | | * | | Fix unique_user_filter_index schema updateBrendan Abolivier2019-10-071-2/+2
| | | * | | | Merge pull request #6159 from matrix-org/erikj/cache_membershipsErik Johnston2019-10-071-19/+45
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Fix bug where we didn't pull out event IDErik Johnston2019-10-071-1/+1
| | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memb...Erik Johnston2019-10-031-6/+15
| | | | |\ \ \
| | | | * | | | Use the right error....Erik Johnston2019-10-031-1/+1
| | | | * | | | pep8Erik Johnston2019-10-031-1/+0
| | | | * | | | Fixup names and commentsErik Johnston2019-10-031-6/+7
| | | | * | | | cachedList descriptor doesn't like typingErik Johnston2019-10-031-2/+2
| | | | * | | | Cache room membership lookups in _get_joined_users_from_contextErik Johnston2019-10-031-19/+45
| | | * | | | | Update `user_filters` table to have a unique index, and non-null columns (#1172)Alexander Maznev2019-10-041-0/+46
| | | | |/ / / | | | |/| | |
| | | * | | | add some metrics on the federation sender (#6160)Richard van der Hoff2019-10-031-6/+15
| | | |/ / /
| | | * | | Merge pull request #6154 from matrix-org/erikj/fix_appservice_paginationErik Johnston2019-10-021-18/+18
| | | |\ \ \
| | | | * | | Fix appservice room list paginationErik Johnston2019-10-021-18/+18
| | | * | | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatableErik Johnston2019-10-021-0/+3
| | | |\ \ \ \
| | | | * | | | Fix not showing non-federatable rooms to remote room list queriesErik Johnston2019-10-021-0/+3
| | | | |/ / /
| | | * | | | Merge pull request #6148 from matrix-org/erikj/find_next_generatedErik Johnston2019-10-021-1/+3
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Bound find_next_generated_user_id DB query.Erik Johnston2019-10-021-1/+3
| | | * | | | Fix public room list pagination.Erik Johnston2019-10-021-17/+36
| | | * | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-022-77/+167
| | | * | | | Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2019-10-021-10/+6
| | | |/ / /
| | | * | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-025-18/+142
| | | |\ \ \
| | | * \ \ \ Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s...Erik Johnston2019-10-013-7/+54
| | | |\ \ \ \
| | | * | | | | Drop unused tables (#6115)Richard van der Hoff2019-09-301-0/+20
| | | | |_|_|/ | | | |/| | |
| | * | | | | Do the update as a background indexErik Johnston2019-10-092-9/+51
| | * | | | | Disable bytes usage with postgresErik Johnston2019-10-083-3/+10
| | | |_|_|/ | | |/| | |
| | * | | | Fix existing hex encoded json values in DBErik Johnston2019-10-081-0/+26
| | * | | | Fix inserting bytes as textErik Johnston2019-10-081-4/+2
| | | |_|/ | | |/| |
| | * | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsErik Johnston2019-10-021-0/+18
| | |\ \ \
| | | * | | Fix errors storing large retry intervals.Erik Johnston2019-10-021-0/+18
| | * | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactionsErik Johnston2019-10-021-0/+14
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix fetching censored redactions from DBErik Johnston2019-10-021-0/+14
| | | | |/ | | | |/|
| | * | | Use `received_ts` to find uncensored redacted eventsErik Johnston2019-10-011-14/+7
| | * | | Add received_ts column to redactions.Erik Johnston2019-10-013-9/+92
| | * | | Don't repeatedly attempt to censor events we don't have.Erik Johnston2019-10-011-1/+17
| | |/ /
| | * / Fix `devices_last_seen` background update.Erik Johnston2019-09-303-7/+54
| | |/
| | * Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-261-3/+15
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-254-9/+94
| | |\
| | | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-253-8/+93
| | | |\
| | | | * Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv...Brendan Abolivier2019-09-242-6/+6
| | | | |\
| | | | | * Incorporate reviewBrendan Abolivier2019-09-241-3/+3
| | | | | * Fix loggingBrendan Abolivier2019-09-241-1/+1
| | | | | * TypoBrendan Abolivier2019-09-231-1/+1
| | | | | * Fix the return value in the users_set_deactivated_flag background jobBrendan Abolivier2019-09-231-4/+4
| | | | * | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-1/+1
| | | | |\ \
| | | | | * | remove unused parameter to get_user_id_by_threepid (#6099)Richard van der Hoff2019-09-241-1/+1
| | | | | |/
| | | | * | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-242-28/+45
| | | | |\|
| | | | | * Implement MSC2290 (#6043)Andrew Morgan2019-09-231-1/+21
| | | | * | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1928-552/+1649
| | | | |\ \
| | | | * | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-132-0/+65
| | | * | | | Use if `is not None`Erik Johnston2019-09-251-1/+1
| | * | | | | Review commentsErik Johnston2019-09-252-5/+2
| | * | | | | Prune rows in user_ips older than configured periodErik Johnston2019-09-241-8/+54
| | * | | | | Add has_completed_background_updateErik Johnston2019-09-241-1/+24
| | |/ / / /
| | * | | | Query devices table for last seen info.Erik Johnston2019-09-231-49/+8
| | * | | | Add BG update to populate devices last seen infoErik Johnston2019-09-232-0/+55
| | * | | | Add last seen info to devices table.Erik Johnston2019-09-232-0/+36
| | | |_|/ | | |/| |
| | * | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-201-7/+24
| | * | | Undo the deletion of some tables (#6047)Richard van der Hoff2019-09-191-20/+0
| | | |/ | | |/|
| | * | Add 'failure_ts' column to 'destinations' table (#6016)Richard van der Hoff2019-09-172-7/+41
| | * | Clean up some code in the retry logic (#6017)Richard van der Hoff2019-09-111-20/+0
| | * | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersJason Robinson2019-09-091-0/+37
| | |\ \
| | | * | Fix code style, againJason Robinson2019-09-091-3/+1
| | | * | Simplify count_real_users SQL to only count user_type is null rowsJason Robinson2019-09-091-1/+1
| | | * | Simplify is_real_user_txn check to trust user_type is null if real userJason Robinson2019-09-091-1/+1
| | | * | Auto-fix a few code style issuesJason Robinson2019-09-091-4/+4
| | | * | Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-091-0/+39
| | * | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-092-1/+119
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix commentsErik Johnston2019-09-091-2/+3
| | | * | Use better names in SQLErik Johnston2019-09-091-5/+8
| | | * | Fixup commentErik Johnston2019-09-091-4/+12
| | | * | Don't start looping call unless enabledErik Johnston2019-09-091-1/+2
| | | * | Handle setting retention period to 0Erik Johnston2019-09-091-1/+1
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red...Erik Johnston2019-09-0516-378/+959
| | | |\ \
| | | * | | Make redaction retention period configurableErik Johnston2019-09-051-2/+4
| | | * | | Censor redactions in DB after a monthErik Johnston2019-08-302-1/+104
| * | | | | use the right function for when we're already in runInteractionHubert Chathi2019-10-181-4/+4
| * | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-074-81/+142
| |\| | | |
* | | | | | make changes based on PR feedbackHubert Chathi2019-09-241-11/+6
* | | | | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-074-81/+142
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Servers-known-about statistic (#5981)Amber Brown2019-09-071-0/+59
| * | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flagErik Johnston2019-09-061-1/+3
| |\ \ \ \ \
| | * | | | | Correctly handle non-bool m.federate flagErik Johnston2019-09-061-1/+3
| | | |_|/ / | | |/| | |
| * | | | | Move delete_threepid_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-25/+25
| * | | | | Move get_threepid_validation_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-54/+54
| |/ / / /
| * | | | Opentracing context cannot be noneJorik Schellekens2019-09-051-1/+1
* | | | | make black happyHubert Chathi2019-09-041-15/+9
* | | | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+1
* | | | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+38
| |/ / / |/| | |
* | | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0416-377/+958
|\| | |
| * | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-045-345/+904
| * | | Remove double return statements (#5962)Andrew Morgan2019-09-033-4/+0
| * | | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-0/+26
| * | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3010-28/+28
| |/ /
* | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2814-328/+653
|\ \ \
| * | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-08-2814-307/+632
| |\| |
| | * | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-281-0/+1
| | |\ \
| | | * | Ignore consent for support usersHalf-Shot2019-08-231-0/+1
| | * | | Fix a cache-invalidation bug for worker-based deployments (#5920)Richard van der Hoff2019-08-281-8/+16
| | * | | Allow schema deltas to be engine-specific (#5911)reivilibre2019-08-271-5/+19
| | |\ \ \
| | | * | | Code style (Black)Olivier Wilkinson (reivilibre)2019-08-271-3/+1
| | | * | | Allow schema deltas to be engine-specificOlivier Wilkinson (reivilibre)2019-08-271-5/+21
| | | |/ /
| | * / / Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-271-0/+23
| | |/ /
| | * | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-222-6/+53
| | * | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-222-3/+49
| | * | Add missing index on users_in_public_rooms. (#5894)Richard van der Hoff2019-08-221-0/+17
| | * | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-221-0/+137