summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Don't require Content-Length header github/anoa/content_length_header_none anoa/content_length_header_noneAndrew Morgan2020-01-091-9/+8
* Don't 500 on not providing a Content-Length header to media uploadAndrew Morgan2020-01-091-2/+2
* Merge pull request #6664 from matrix-org/erikj/media_admin_apisErik Johnston2020-01-082-120/+130
|\
| * 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
| * Import RoomStore in media worker to fix admin APIsErik Johnston2020-01-081-0/+2
| * Move media admin store functions to worker storeErik Johnston2020-01-081-120/+120
* | Merge remote-tracking branch 'origin/release-v1.8.0' into developRichard van der Hoff2020-01-082-24/+10
|\ \
| * | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-081-2/+2
| * | Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-081-22/+8
| |/
* | Correctly proxy remote group HTTP errors. (#6654)Erik Johnston2020-01-071-0/+16
* | Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoBrendan Abolivier2020-01-071-5/+5
|\ \ | |/ |/|
| * RewordBrendan Abolivier2020-01-071-3/+3
| * Change the example from 5min to 12hBrendan Abolivier2020-01-071-4/+4
| * Fix a typo in the purge jobs configuration exampleBrendan Abolivier2020-01-031-1/+1
* | 1.8.0rc1Erik Johnston2020-01-071-1/+1
* | Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsBrendan Abolivier2020-01-072-3/+3
|\ \
| * | Fix conditions failing if min_depth = 0Brendan Abolivier2020-01-072-3/+3
| |/
* | 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-072-15/+47
|\ \
| * | Fix exceptions in log when rejected event is replicatedRichard van der Hoff2020-01-061-2/+9
| * | async/await for SyncReplicationHandler.process_and_notifyRichard van der Hoff2020-01-061-5/+4
| * | 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-064-87/+49
|\ \ \ | |/ / |/| |
| * | 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
| * | Remove unused hashes and depths from _update_membership paramsRichard van der Hoff2020-01-061-13/+4
| * | Remove unused hashes and depths from create_event paramsRichard van der Hoff2020-01-062-17/+12
| * | Remove unused hashes and depths from create_new_client_event paramsRichard van der Hoff2020-01-062-12/+26
| * | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ...Richard van der Hoff2020-01-062-9/+38
| * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-063-5/+10
* | | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-064-11/+19
* | | Add experimental 'databases' config (#6580)Erik Johnston2020-01-062-13/+63
* | | Fix an error which was thrown by the PresenceHandler _on_shutdown handler. (#...Richard van der Hoff2020-01-061-7/+2
* | | Fix exception when fetching notary server's old keys (#6625)Richard van der Hoff2020-01-061-6/+7
* | | Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-061-8/+22
|/ /
* | Fix power levels being incorrectly set in old and new rooms after a room upgr...Andrew Morgan2020-01-061-7/+10
* | Automate generation of the sample and debian log configs (#6627)Richard van der Hoff2020-01-031-1/+8
* | Raise an error if someone tries to use the log_file config option (#6626)Richard van der Hoff2020-01-032-3/+16
* | Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-036-123/+2
* | Kill off redundant SynapseRequestFactory (#6619)Richard van der Hoff2020-01-031-15/+3
* | Reduce the reconnect time when replication fails. (#6617)Richard van der Hoff2020-01-031-1/+2
|/
* Merge branch 'master' into developRichard van der Hoff2019-12-312-16/+38
|\
| * 1.7.3 v1.7.3 github/release-v1.7.3 release-v1.7.3Richard van der Hoff2019-12-311-1/+1
| * Hacks to work around #6605 (#6608)Richard van der Hoff2019-12-311-15/+37
* | Merge branch 'master' into developRichard van der Hoff2019-12-202-2/+5
|\|
| * 1.7.2 v1.7.2 github/release-v1.7.2 release-v1.7.2Richard van der Hoff2019-12-201-1/+1
| * Backport fixes to sqlite upgrade from develop (#6578)Richard van der Hoff2019-12-201-1/+9
| * Fix exceptions when attempting to backfill (#6576)Richard van der Hoff2019-12-201-1/+4
* | Split state groups into a separate data store (#6296)Erik Johnston2019-12-2024-1162/+1152
* | Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-2013-39/+49
* | Explode on duplicate delta file names. (#6565)Erik Johnston2019-12-191-0/+18
* | Port some admin handlers to async/await (#6559)Erik Johnston2019-12-193-56/+45
* | Improve diagnostics on database upgrade failure (#6570)Richard van der Hoff2019-12-192-8/+6
* | Fix sdnotify with acme enabled (#6571)Richard van der Hoff2019-12-191-3/+7
* | Add an export_signing_key script (#6546)Richard van der Hoff2019-12-191-8/+15
* | Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-184-43/+37
* | Add delta file to fix missing default table data (#6555)Andrew Morgan2019-12-183-15/+23
* | Add database config class (#6513)Erik Johnston2019-12-189-73/+160
* | Merge branch 'master' into developRichard van der Hoff2019-12-181-1/+1
|\|
| * 1.7.1Richard van der Hoff2019-12-181-1/+1
* | Merge release-v1.7.1 into developRichard van der Hoff2019-12-184-10/+16
|\|
| * Fix bug where we added duplicate event IDs as auth_events (#6560)Erik Johnston2019-12-171-7/+8
| * Add auth events as per spec. (#6556)Erik Johnston2019-12-161-67/+34
| * Merge pull request #6553 from matrix-org/babolivier/fix-context-filterBrendan Abolivier2019-12-162-3/+7
| |\
| | * Incorporate reviewBrendan Abolivier2019-12-161-1/+1
| | * Update the documentation of the filtering functionBrendan Abolivier2019-12-161-1/+2
| | * Use the filtered version of an event when responding to /context requests for...Brendan Abolivier2019-12-161-1/+4
| * | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-1/+1
| * | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-162-165/+82
| * | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-164-43/+124
| * | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-161-0/+12
| * | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-161-24/+54
| * | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-161-18/+21
| * | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-162-86/+106
| * | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-161-29/+15
| |/
* | Remove unused `get_pagination_rows` methods. (#6557)Erik Johnston2019-12-173-18/+0
* | Add auth events as per spec. (#6556)Erik Johnston2019-12-161-67/+34
* | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-162-1/+18
* | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-1/+1
* | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-162-169/+82
* | Automatically delete empty groups/communities (#6453)Werner Sembach2019-12-162-0/+34
* | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-134-43/+124
* | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-131-0/+12
* | Merge pull request #6537 from matrix-org/erikj/bump_mypy_versionErik Johnston2019-12-136-6/+11
|\ \
| * | Bump version of mypyErik Johnston2019-12-126-6/+11
* | | Merge branch 'master' into developErik Johnston2019-12-131-1/+1
|\ \ \ | | |/ | |/|
| * | 1.7.0Erik Johnston2019-12-131-1/+1
* | | Merge pull request #6496 from matrix-org/erikj/initial_sync_asnycErik Johnston2019-12-131-52/+44
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sy...Erik Johnston2019-12-1170-693/+1121
| |\ \ \
| * | | | Port synapse.handlers.initial_sync to async/awaitErik Johnston2019-12-091-52/+44
* | | | | look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-123-13/+241
* | | | | Fix redacted events being returned in search results ordered by "recent" (#6522)Andrew Morgan2019-12-121-3/+8
| |_|_|/ |/| | |
* | | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-121-23/+51
* | | | Merge pull request #6511 from matrix-org/erikj/remove_db_config_from_appsErik Johnston2019-12-1213-62/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | Add new config param to docstring and add typesErik Johnston2019-12-111-1/+3
| * | | Remove database config parsing from apps.Erik Johnston2019-12-1013-62/+10
* | | | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-111-22/+28
* | | | Merge pull request #6517 from matrix-org/rav/event_auth/13Richard van der Hoff2019-12-112-98/+88
|\ \ \ \
| * | | | convert to async: FederationHandler._process_received_pduRichard van der Hoff2019-12-111-11/+10
| * | | | convert to async: FederationHandler._get_state_for_roomRichard van der Hoff2019-12-111-21/+21
| * | | | convert to async: FederationHandler.on_receive_pduRichard van der Hoff2019-12-111-27/+22
| * | | | Convert federation backfill to asyncRichard van der Hoff2019-12-112-39/+35
* | | | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_awaitErik Johnston2019-12-112-55/+45
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Port handlers.account_validity to async/await.Erik Johnston2019-12-102-47/+41
| * | | | Port handlers.account_data to async/await.Erik Johnston2019-12-101-9/+5
| |/ / /
* | | | Clean up some logging (#6515)Richard van der Hoff2019-12-111-18/+19
* | | | Merge tag 'v1.7.0rc2' into developErik Johnston2019-12-114-8/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | 1.7.0rc2 v1.7.0rc2Erik Johnston2019-12-111-1/+1
| * | | Back out change preventing setting null avatar URLsErik Johnston2019-12-111-6/+6
| * | | Merge branch 'erikj/fix_sqlite_7' of github.com:matrix-org/synapse into relea...Erik Johnston2019-12-116-14/+49
| |\ \ \
| * | | | Give the server config to the RoomWorkerStoreBrendan Abolivier2019-12-101-0/+5
| * | | | Make the PusherSlaveStore inherit from the slave RoomStoreBrendan Abolivier2019-12-101-1/+6
* | | | | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-115-43/+77
* | | | | 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-113-16/+40
* | | | | Merge pull request #6349 from matrix-org/babolivier/msc1802Brendan Abolivier2019-12-114-28/+140
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into babolivier/msc1802Brendan Abolivier2019-12-05147-2521/+3950
| |\ \ \ \ \
| * | | | | | LintBrendan Abolivier2019-11-111-3/+2
| * | | | | | LintBrendan Abolivier2019-11-111-3/+1
| * | | | | | Fix prefix for v2/send_leaveBrendan Abolivier2019-11-111-0/+2
| * | | | | | Add server-side support to the v2 APIBrendan Abolivier2019-11-112-14/+33
| * | | | | | Implement v2 API for send_leaveBrendan Abolivier2019-11-112-5/+56
| * | | | | | Add missing yieldBrendan Abolivier2019-11-111-1/+1
| * | | | | | Implement v2 API for send_joinBrendan Abolivier2019-11-112-8/+51
* | | | | | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-102-86/+106
* | | | | | | Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-102-88/+296
* | | | | | | Merge pull request #6510 from matrix-org/erikj/phone_home_stats_dbErik Johnston2019-12-101-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Phone home stats DB reporting should not assume a single DB.Erik Johnston2019-12-101-2/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Fix race which caused deleted devices to reappear (#6514)Richard van der Hoff2019-12-101-3/+5
* | | | | | | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-101-29/+15
* | | | | | | Remove redundant code from event authorisation implementation. (#6502)Richard van der Hoff2019-12-101-6/+2
* | | | | | | Merge pull request #6505 from matrix-org/erikj/make_deferred_yiedableErik Johnston2019-12-101-1/+10
|\ \ \ \ \ \ \
| * | | | | | | Update commentErik Johnston2019-12-101-2/+4
| * | | | | | | Fix make_deferred_yieldable to work with coroutinesErik Johnston2019-12-101-1/+8
| |/ / / / / /
* | | | | | | Merge pull request #6499 from matrix-org/erikj/fix_sqlite_7Erik Johnston2019-12-105-11/+41
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | 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 #6506 from matrix-org/erikj/remove_snapshot_cacheErik Johnston2019-12-102-105/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Remove SnapshotCache in favour of ResponseCacheErik Johnston2019-12-092-105/+8
* | | | | Merge tag 'v1.7.0rc1' into developNeil Johnson2019-12-091-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 1.7.0rc1 v1.7.0rc1Neil Johnson2019-12-091-1/+1
* | | | | Better errors regarding changing avatar_url (#6497)Andrew Morgan2019-12-091-3/+8
|/ / / /
* | | | Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Neil Johnson2019-12-091-30/+8
* | | | Merge pull request #6487 from matrix-org/erikj/pass_in_dbErik Johnston2019-12-0946-183/+214
|\ \ \ \ | |/ / / |/| | |
| * | | 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-062-18/+12
| * | | Pass Database into the data storeErik Johnston2019-12-065-28/+24
| * | | Move are_all_users_on_domain checks to main data store.Erik Johnston2019-12-063-24/+24
| * | | Change DataStores to accept 'database' param.Erik Johnston2019-12-0640-112/+153
* | | | Merge pull request #6493 from matrix-org/erikj/invite_state_configErik Johnston2019-12-091-1/+3
|\ \ \ \
| * | | | Pull out room_invite_state_types config option once.Erik Johnston2019-12-091-1/+3
| |/ / /
* | | | Fix inaccurate per-block metrics (#6491)Richard van der Hoff2019-12-091-42/+18
* | | | Remove fallback for missing /federation/v1/state_ids API (#6488)Richard van der Hoff2019-12-092-96/+17
* | | | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-097-177/+164
|\ \ \ \ | |/ / / |/| | |
| * | | Fixup functions to consistently return deferredsErik Johnston2019-12-064-7/+7
| * | | Port SyncHandler to async/awaitErik Johnston2019-12-054-173/+160
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab...Erik Johnston2019-12-0641-817/+675
|\ \ \ \ | | |_|/ | |/| |
| * | | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-056-109/+114
| |/ /
| * | Port rest.client.v2Erik Johnston2019-12-0523-505/+361
| * | Port rest/v1 to async/awaitErik Johnston2019-12-0511-167/+118
| * | Stronger typing in the federation handler (#6480)Richard van der Hoff2019-12-051-24/+57
| * | Sanity-check the rooms of auth events before pulling them in. (#6472)Richard van der Hoff2019-12-051-9/+25
* | | Remove unused varErik Johnston2019-12-061-2/+0
* | | Move background update handling out of storeErik Johnston2019-12-0519-148/+165
* | | CommentsErik Johnston2019-12-053-5/+16
* | | Move DB pool and helper functions into dedicated Database classErik Johnston2019-12-0547-2195/+2274
|/ /
* | Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseErik Johnston2019-12-0546-519/+512
|\ \
| * | Remove underscore from SQLBaseStore functionsErik Johnston2019-12-0444-501/+493
| * | Don't call SQLBaseStore methods from outside storesErik Johnston2019-12-044-19/+20
* | | 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-042-72/+24
|/ /
* | Merge pull request #6454 from matrix-org/erikj/clean_base_StoreErik Johnston2019-12-048-192/+221
|\ \
| * | Revert "Move get_user_count_txn out of base store"Erik Johnston2019-12-042-12/+12
| * | _CURRENT_STATE_CACHE_NAME is publicErik Johnston2019-12-042-5/+5
| * | Move get_user_count_txn out of base storeErik Johnston2019-12-042-12/+12
| * | Move cache invalidation to main data storeErik Johnston2019-12-046-113/+143
| * | 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 #6441 from syamgk/fix-parameter-mismatchErik Johnston2019-12-041-1/+1
|\ \ \
| * | | Issue #6406 Fix parameter mismatchSyam G Krishnan2019-12-041-1/+1
* | | | Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-045-3/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0487-1315/+3016
| |\ \ \
| * | | | Incorporate reviewBrendan Abolivier2019-12-041-2/+1
| * | | | Also filter state eventsBrendan Abolivier2019-11-061-1/+7
| * | | | Only filter if a filter was providedBrendan Abolivier2019-11-051-4/+6
| * | | | Update copyrightBrendan Abolivier2019-11-051-1/+2
| * | | | Update copyrightsBrendan Abolivier2019-11-054-1/+11
| * | | | Filter events_before and events_after in /context requestsBrendan Abolivier2019-11-051-2/+4
* | | | | 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
* | | | | | privacy by default for room dir (#6355)Neil Johnson2019-12-041-12/+14
* | | | | | 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-036-7/+277
| |_|/ / / |/| | | |
* | | | | Add benchmarks for structured logging performance (#6266)Amber Brown2019-12-031-0/+1
|/ / / /
* | | | Transfer power level state events on room upgrade (#6237)Andrew Morgan2019-12-021-5/+31
* | | | Fix: Pillow error when uploading RGBA image (#3325) (#6241)Filip Štědronský2019-12-021-1/+4
| |/ / |/| |
* | | Add User-Interactive Auth to /account/3pid/add (#6119)Andrew Morgan2019-11-291-0/+5
* | | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasonsErik Johnston2019-11-295-10/+21
|\ \ \
| * | | Propagate reason in remotely rejected invitesErik Johnston2019-11-284-9/+20
| * | | MSC2367 Allow reason field on all member eventsErik Johnston2019-11-281-1/+1
* | | | Merge pull request #6436 from matrix-org/babolivier/fix-state-retrievalBrendan Abolivier2019-11-292-9/+19
|\ \ \ \
| * | | | LintBrendan Abolivier2019-11-281-4/+8
| * | | | Discard retention policies when retrieving stateBrendan Abolivier2019-11-282-9/+15
| |/ / /
* | | | Merge branch 'master' into developAndrew Morgan2019-11-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 1.6.1 v1.6.1 github/release-v1.6.1 release-v1.6.1Andrew Morgan2019-11-281-1/+1
| * | | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-282-0/+16
| * | | Fix startup error when http proxy is defined. (#6421)Richard van der Hoff2019-11-272-4/+4
* | | | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-282-0/+16
* | | | Clarifications for the email configuration settings. (#6423)Richard van der Hoff2019-11-281-1/+16
* | | | Implementation of MSC2314 (#6176)Amber Brown2019-11-282-12/+20
* | | | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-274-120/+261
* | | | Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-2710-8/+698
|\ \ \ \
| * \ \ \ Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-2672-1202/+2058
| |\ \ \ \
| * | | | | Fix worker modeBrendan Abolivier2019-11-191-56/+56
| * | | | | Fix 3PID invite exchangeBrendan Abolivier2019-11-191-1/+1
| * | | | | Lint againBrendan Abolivier2019-11-191-1/+1
| * | | | | Lint againBrendan Abolivier2019-11-191-1/+1
| * | | | | LintBrendan Abolivier2019-11-193-51/+54
| * | | | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-061-6/+9
| * | | | | Implement per-room message retention policiesBrendan Abolivier2019-11-0410-6/+690
* | | | | | Remove assertion and provide a clear warning on startup for missing public_ba...Andrew Morgan2019-11-262-0/+9
* | | | | | Merge pull request #6343 from matrix-org/rav/event_auth/4Richard van der Hoff2019-11-261-37/+44
|\ \ \ \ \ \
| * | | | | | remove confusing fixmeRichard van der Hoff2019-11-261-6/+0
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4Richard van der Hoff2019-11-1821-42/+52
| |\ \ \ \ \ \
| * | | | | | | Use get_events_as_list rather than lots of calls to get_eventRichard van der Hoff2019-11-081-16/+8
| * | | | | | | Update some docstrings and commentsRichard van der Hoff2019-11-081-8/+31
| * | | | | | | Simplify _update_auth_events_and_context_for_authRichard van der Hoff2019-11-081-11/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix startup error when http proxy is defined. (#6421)Richard van der Hoff2019-11-262-4/+4
| |_|_|/ / / |/| | | | |
* | | | | | Don't construct a setErik Johnston2019-11-261-6/+3
* | | | | | Fix find_next_generated_user_id_localpartErik Johnston2019-11-261-10/+7
* | | | | | Merge branch 'master' into developAndrew Morgan2019-11-262-2/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 1.6.0 v1.6.0 github/release-v1.6.0 release-v1.6.0Andrew Morgan2019-11-261-1/+1
| * | | | | Fix phone home stats (#6418)Erik Johnston2019-11-261-1/+1
* | | | | | Prevent account_data content from being sent over TCP replication (#6333)Andrew Morgan2019-11-262-7/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account...Andrew Morgan2019-11-141-1/+1
| |\ \ \ \ \ \
| * | | | | | | lintAndrew Morgan2019-11-081-2/+1
| * | | | | | | Remove content from being sent for account data rdata streamAndrew Morgan2019-11-082-6/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fixErik Johnston2019-11-263-4/+98
|\ \ \ \ \ \ \
| * | | | | | | Fixup docsErik Johnston2019-11-261-1/+5
| * | | | | | | Fix caching devices for remote servers in worker.Erik Johnston2019-11-053-4/+94
* | | | | | | | 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-252-19/+26
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-22 16:32:14 +0000