summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | 1.6.0rc2 v1.6.0rc2Richard van der Hoff2019-11-251-1/+1
| * | | | | | | Fix exceptions from background database update for event labels. (#6407)Richard van der Hoff2019-11-251-18/+25
* | | | | | | | Improve the performance of structured logging (#6322)Amber Brown2019-11-262-30/+90
* | | | | | | | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-2125-46/+42
|/ / / / / / /
* | | | | | | 1.6.0rc1 v1.6.0rc1Andrew Morgan2019-11-201-1/+1
* | | | | | | Move admin endpoints into separate files (#6308)Manuel Stahl2019-11-204-555/+621
* | | | | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanupsBrendan Abolivier2019-11-202-70/+125
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | LintBrendan Abolivier2019-11-201-1/+3
| * | | | | | Apply suggestions from code reviewErik Johnston2019-11-182-3/+3
| * | | | | | Add failed auth ratelimiting to UIAErik Johnston2019-11-061-1/+32
| * | | | | | Only do `rc_login` ratelimiting on succesful login.Erik Johnston2019-11-062-72/+94
| |/ / / / /
* | | | | | 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 branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_...Andrew Morgan2019-11-141-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5Brendan Abolivier2019-11-141-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Set room version default to 5Neil Johnson2019-10-191-1/+1
* | | | | | A couple more instancesAndrew Morgan2019-11-122-2/+2
* | | | | | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-1218-31/+31
|/ / / / /
* | | | | 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-085-174/+323
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-053-83/+94
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | 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-0464-336/+1288
| |\ \ \ \ \ \
| * | | | | | | 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-3179-218/+562
| |\ \ \ \ \ \ \
| * | | | | | | | Split purge API into events vs stateErik Johnston2019-10-305-177/+300
* | | | | | | | | 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
| * | | | | | | | | Merge branch 'develop' into babolivier/msc2326_bg_updateBrendan Abolivier2019-11-046-92/+189
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | 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-073-1/+29
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad...Andrew Morgan2019-11-043-83/+94
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Re-add docstring, with caveats detailedAndrew Morgan2019-11-043-3/+7
| * | | | | | | | | Transfer upgraded rooms on groupsAndrew Morgan2019-11-042-0/+24
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Fix LruCache callback deduplication (#6213)V024602019-11-071-11/+37
* | | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking (#6...Andrew Morgan2019-11-063-21/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | raise exception after multiple failuresAndrew Morgan2019-11-061-3/+10
| * | | | | | | | | Address review commentsAndrew Morgan2019-11-062-13/+13
| * | | | | | | | | Don't forget to ratelimit calls outside of RegistrationHandlerAndrew Morgan2019-11-062-2/+4
| * | | | | | | | | Numeric ID checker now checks @0, don't ratelimit on checkingAndrew Morgan2019-11-062-20/+29
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into developRichard van der Hoff2019-11-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 1.5.1 v1.5.1Richard van der Hoff2019-11-061-1/+1
* | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-064-92/+108
* | | | | | | | | Add some checks that we aren't using state from rejected events (#6330)Richard van der Hoff2019-11-052-6/+49
* | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_statsErik Johnston2019-11-051-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix phone home statsErik Johnston2019-11-051-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2Richard van der Hoff2019-11-051-1/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Fix exception when OpenGraph tag values are intsRichard van der Hoff2019-11-051-1/+2
* | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-05143-1693/+3109
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | / / / / / Improve documentation for EventContext fields (#6319)Richard van der Hoff2019-11-052-26/+68
| | |/ / / / / | |/| | | | |
| * | | | | | Remove the psutil dependency (#6318)Amber Brown2019-11-053-83/+94
| |/ / / / /
| * / / / / document the REPLICATE command a bit better (#6305)Richard van der Hoff2019-11-043-9/+95
| |/ / / /
| * | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-016-4/+98
| |\ \ \ \
| | * | | | Incorporate reviewBrendan Abolivier2019-11-014-3/+9
| | * | | | 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
| | * | | | Add unstable feature flagBrendan Abolivier2019-11-011-0/+3
| | * | | | LintBrendan Abolivier2019-11-012-1/+2
| | * | | | Incorporate reviewBrendan Abolivier2019-11-013-5/+18
| | * | | | LintBrendan Abolivier2019-10-301-7/+1
| | * | | | Add more integration testingBrendan Abolivier2019-10-301-1/+1
| | * | | | Add unit testsBrendan Abolivier2019-10-301-1/+1
| | * | | | Add index on labelBrendan Abolivier2019-10-301-1/+3
| | * | | | Implement filteringBrendan Abolivier2019-10-302-2/+20
| | * | | | Store labels for new eventsBrendan Abolivier2019-10-302-1/+22
| | * | | | Add database table for keeping track of labels on eventsBrendan Abolivier2019-10-291-0/+20
| * | | | | Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-012-84/+61
| * | | | | 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
| * | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-0110-6/+429
| * | | | | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-012-3/+3
| * | | | | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-014-30/+91
| * | | | | | Update synapse/storage/data_stores/main/devices.pyHubert Chathi2019-10-311-1/+1
| * | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-31108-380/+803
| |\| | | | |
| | * | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-315-3/+58
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-31103-376/+742
| | | |\ \ \ \ \
| | | * | | | | | clean up code a bitHubert Chathi2019-10-311-5/+9
| | | * | | | | | make user signatures a separate streamHubert Chathi2019-10-305-14/+50
| | | * | | | | | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-3043-1142/+1234
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | * | | | | | make notification of signatures work with workersHubert Chathi2019-10-243-2/+17
| | * | | | | | | rstrip slashes from url on appservice (#6306)Will Hunt2019-10-311-1/+3
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Update black to 19.10b0 (#6304)Amber Brown2019-11-0137-158/+179
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-3119-66/+338
| | |\ \ \ \ \
| | | * | | | | Apply suggestions from code review Erik Johnston2019-10-311-1/+2
| | | * | | | | Port to use state storageErik Johnston2019-10-3016-65/+102
| | | * | | | | Add StateGroupStorage interfaceErik Johnston2019-10-303-1/+235
| | | | |/ / / | | | |/| | |
| | * | | | | Expose some homeserver functionality to spam checkers (#6259)Travis Ralston2019-10-312-1/+64
| | * | | | | Fix /purge_room API.Erik Johnston2019-10-311-1/+0
| | * | | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-3162-145/+159
| | * | | | | fix delete_existing for _persist_events (#6300)Richard van der Hoff2019-10-302-5/+2
| | |/ / / /
| * | | | | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-302-6/+6
| * | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3042-1075/+1167
| |\| | | |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-3045-542/+555
| | |\ \ \ \
| | | * \ \ \ Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorErik Johnston2019-10-301-4/+5
| | | |\ \ \ \
| | | | * | | | Clarify docstringErik Johnston2019-10-301-0/+4
| | | | * | | | Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-301-5/+2
| | | * | | | | Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-301-1/+1
| | | * | | | | Fix small typo in comment (#6269)Andrew Morgan2019-10-301-1/+1
| | | |/ / / /
| | | * | | | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-301-1/+1
| | | * | | | Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2019-10-301-4/+6
| | | * | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-306-53/+32
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s...Erik Johnston2019-10-291-1/+1
| | | | |\ \ \ \
| | | | * | | | | Port receipt and read markers to async/waitErik Johnston2019-10-296-53/+32
| | | * | | | | | Merge pull request #6274 from matrix-org/erikj/replication_asyncErik Johnston2019-10-306-44/+26
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio...Erik Johnston2019-10-291-1/+1
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | |
| | | | * | | | | | Port replication http server endpoints to async/awaitErik Johnston2019-10-296-44/+26
| | | * | | | | | | Merge pull request #6275 from matrix-org/erikj/port_rest_eventsErik Johnston2019-10-301-94/+72
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_...Erik Johnston2019-10-291-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | |
| | | | * | | | | | | Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
| | | | | |/ / / / / | | | | |/| | | | |
| | | * | | | | | | Don't return coroutinesErik Johnston2019-10-291-6/+6
| | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation...Erik Johnston2019-10-291-1/+1
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Merge branch 'master' into developRichard van der Hoff2019-10-291-1/+1
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | Make concurrently_execute work with async/awaitErik Johnston2019-10-291-4/+3
| | | * | | | | Port federation_server to async/awaitErik Johnston2019-10-291-118/+87
| | | |/ / / /
| | | * | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsErik Johnston2019-10-293-7/+6
| | | |\ \ \ \
| | | | * | | | Update docstringErik Johnston2019-10-291-3/+2
| | | | * | | | Quick fix to ensure cache descriptors always return deferredsErik Johnston2019-10-283-4/+4
| | | * | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-291-4/+8
| | | |\ \ \ \ \
| | | * | | | | | Add CI for synapse_port_db (#6140)Brendan Abolivier2019-10-281-3/+6
| | | | |/ / / / | | | |/| | | |