summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into developRichard van der Hoff2020-04-031-1/+1
|\
| * Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_white...Richard van der Hoff2020-04-031-0/+15
| * Revert "Revert "Improve the UX of the login fallback when using SSO (#7152)""Richard van der Hoff2020-04-032-22/+31
| * 1.12.3Richard van der Hoff2020-04-031-1/+1
| * Fix the debian build in a better way. (#7212)Richard van der Hoff2020-04-031-3/+1
| * 1.12.2Andrew Morgan2020-04-021-1/+1
| * Pin Pillow>=4.3.0,<7.1.0 to fix dep issueAndrew Morgan2020-04-021-1/+3
| * 1.12.1Andrew Morgan2020-04-021-1/+1
* | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-031-2/+8
* | Merge branch 'master' into developAndrew Morgan2020-04-021-1/+1
|\ \
| * \ Merge tag 'v1.12.1'Andrew Morgan2020-04-024-13/+32
| |\ \
| | * | 1.12.1 v1.12.1 github/release-v1.12.1 release-v1.12.1Andrew Morgan2020-04-021-1/+1
| | |/
| | * 1.12.1rc1Andrew Morgan2020-03-311-1/+1
| | * Only import sqlite3 when type checkingDavid Vo2020-03-311-2/+5
| | * Fix another instanceAndrew Morgan2020-03-311-5/+7
| | * Only setdefault for signatures if device has key_jsonAndrew Morgan2020-03-311-5/+7
| | * Fix starting workers when federation sending not split out.Erik Johnston2020-03-311-0/+12
| * | Improve the UX of the login fallback when using SSO (#7152)Brendan Abolivier2020-03-272-22/+31
| * | Update the wording of the config commentBrendan Abolivier2020-03-271-3/+3
| * | Whitelist the login fallback by default for SSOBrendan Abolivier2020-03-261-1/+16
| |/
* | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-019-44/+218
* | Allow admins to create aliases when they are not in the room (#7191)Patrick Cloke2020-04-011-1/+5
* | Remove connections per replication stream metric. (#7195)Erik Johnston2020-04-011-16/+0
* | Fix "'NoneType' has no attribute start|stop" logcontext errors (#7181)Richard van der Hoff2020-03-312-7/+11
* | Fill in the 'default' field for user-defined push rules (#6639)Karlinde2020-03-311-0/+1
* | Only setdefault for signatures if device has key_json (#7177)Andrew Morgan2020-03-311-10/+14
* | Fix use of async/await in media code (#7184)Patrick Cloke2020-03-311-2/+2
* | Fix a bug which could cause incorrect 'cyclic dependency' error. (#7178)Richard van der Hoff2020-03-311-12/+10
* | Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-303-37/+80
* | Transfer alias mappings when joining an upgraded room (#6946)Andrew Morgan2020-03-302-3/+26
* | Fix a small typo in the `metrics_flags` config option. (#7171)Andrew Morgan2020-03-301-1/+1
* | Remove usage of "conn_id" for presence. (#7128)Erik Johnston2020-03-307-22/+79
* | Merge pull request #7160 from matrix-org/dbkr/always_send_own_device_list_upd...David Baker2020-03-302-3/+18
|\ \
| * | Add explanatory commentAndrew Morgan2020-03-302-1/+4
| * | blackDavid Baker2020-03-301-1/+3
| * | Just add own user ID to the list we track device changes forDavid Baker2020-03-302-7/+11
| * | Fix undefined variable & remove debug loggingDavid Baker2020-03-271-10/+2
| * | blackDavid Baker2020-03-271-4/+4
| * | Always send the user updates to their own device listDavid Baker2020-03-272-6/+20
* | | Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-271-0/+15
* | | Improve the UX of the login fallback when using SSO (#7152)Brendan Abolivier2020-03-272-22/+31
* | | Admin API to join users to a room. (#7051)Dirk Klimpel2020-03-272-4/+82
* | | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-273-0/+59
* | | Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150)Andrew Morgan2020-03-272-2/+3
* | | Only import sqlite3 when type checking (#7155)David Vo2020-03-271-2/+5
|/ /
* | Merge pull request #7151 from matrix-org/jaywink/saml-redirect-fixJason Robinson2020-03-261-0/+4
|\ \
| * | Allow RedirectResponse in SAML response handlerJason Robinson2020-03-261-0/+4
* | | Refactor the CAS code (move the logic out of the REST layer to a handler) (#7...Patrick Cloke2020-03-263-155/+225
* | | Don't default to an invalid sqlite config if no database configuration is pro...Nektarios Katakis2020-03-261-22/+47
* | | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-268-0/+222
|/ /
* | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-265-12/+47
* | Remove unused captcha_bypass_secret option (#7137)Aaron Raimist2020-03-251-5/+0
* | Move catchup of replication streams to worker. (#7024)Erik Johnston2020-03-2520-431/+537
* | Merge pull request #7133 from matrix-org/erikj/fix_worker_startupErik Johnston2020-03-251-0/+12
|\ \
| * | Fix starting workers when federation sending not split out.Erik Johnston2020-03-241-0/+12
| |/
* | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-2411-163/+161
* | Fix CAS redirect url (#6634)Naugrimm2020-03-241-11/+16
* | Use the proper error code when a canonical alias that does not exist is used....Patrick Cloke2020-03-231-19/+38
* | Convert `*StreamRow` classes to inner classes (#7116)Richard van der Hoff2020-03-234-98/+103
* | Merge branch 'master' into developRichard van der Hoff2020-03-231-1/+1
|\|
| * 1.12.0Richard van der Hoff2020-03-231-1/+1
* | Fix processing of `groups` stream, and use symbolic names for streams (#7117)Richard van der Hoff2020-03-232-30/+75
* | Set Referrer-Policy to no-referrer for media (#7009)Dionysis Grigoropoulos2020-03-231-0/+3
* | Clean-up some auth/login REST code (#7115)Patrick Cloke2020-03-202-41/+20
* | Improve database configuration docs (#6988)Richard van der Hoff2020-03-202-36/+59
* | Remove concept of a non-limited stream. (#7011)Erik Johnston2020-03-207-67/+70
* | Convert some of the media REST code to async/await (#7110)Patrick Cloke2020-03-203-111/+90
* | Fix a bug in the federation API which could cause occasional "Failed to get P...Patrick Cloke2020-03-193-30/+21
* | Change device list streams to have one row per ID (#7010)Erik Johnston2020-03-195-85/+111
|\ \ | |/ |/|
| * Comments from reviewErik Johnston2020-03-183-8/+25
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devi...Erik Johnston2020-03-023-29/+45
| |\
| * | Fix worker handlingErik Johnston2020-03-021-2/+3
| * | Remove handling of multiple rows per IDErik Johnston2020-02-281-34/+1
| * | Change device list replication to match new semantics.Erik Johnston2020-02-284-23/+32
| * | Change device lists stream to have one row per id.Erik Johnston2020-02-281-18/+41
| * | Add 'device_lists_outbound_pokes' as extra table.Erik Johnston2020-02-282-2/+11
* | | 1.12.0rc1Richard van der Hoff2020-03-191-1/+1
* | | Fix concurrent modification errors in pusher metrics (#7106)Richard van der Hoff2020-03-191-9/+18
* | | Add prometheus metrics for the number of active pushers (#7103)Richard van der Hoff2020-03-193-8/+33
* | | Move pusherpool startup into _base.setup (#7104)Richard van der Hoff2020-03-192-1/+1
* | | Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-183-49/+161
* | | Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-183-19/+33
* | | Share SSL contexts for non-federation requests (#7094)Richard van der Hoff2020-03-174-31/+48
* | | Set charset to utf-8 when adding headers for certain text content types (#7044)The Stranjer2020-03-171-1/+24
* | | Remove unused federation endpoint (`query_auth`) (#7026)Patrick Cloke2020-03-174-146/+79
* | | Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-172-27/+1
* | | Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-173-49/+0
* | | Populate the room version from state events (#7070)Brendan Abolivier2020-03-162-0/+62
* | | Fix buggy condition in account validity handler (#7074)Brendan Abolivier2020-03-161-1/+5
* | | Merge pull request #7067 from matrix-org/babolivier/saml_error_moarBrendan Abolivier2020-03-132-23/+72
|\ \ \
| * | | Use innerText instead of innerHTMLBrendan Abolivier2020-03-131-1/+2
| * | | LintBrendan Abolivier2020-03-111-2/+1
| * | | Put the file in the templates directoryBrendan Abolivier2020-03-111-12/+21
| * | | Update wording and configBrendan Abolivier2020-03-112-2/+5
| * | | Move the default SAML2 error HTML to a dedicated fileBrendan Abolivier2020-03-112-18/+55
* | | | Add type annotations and comments to auth handler (#7063)Patrick Cloke2020-03-121-89/+104
* | | | Refactor a bitBrendan Abolivier2020-03-111-28/+30
* | | | Also don't fail on aliases events in this caseBrendan Abolivier2020-03-111-1/+1
* | | | LintBrendan Abolivier2020-03-111-1/+5
* | | | Also don't filter out events sent by ignored users when checking state visibi...Brendan Abolivier2020-03-111-1/+1
* | | | Fix conditionBrendan Abolivier2020-03-111-1/+1
* | | | Don't filter out dummy events when we're checking the visibility of stateBrendan Abolivier2020-03-112-9/+8
|/ / /
* | | Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-103-0/+49
|\ \ \
| * | | Update synapse/config/registration.pyDirk Klimpel2020-03-101-1/+1
| * | | lint, fix testsdklimpel2020-03-091-1/+3
| * | | updates after reviewdklimpel2020-03-093-18/+24
| * | | add disable_3pid_changesdklimpel2020-03-082-0/+16
| * | | lint2dklimpel2020-03-081-2/+2
| * | | lintdklimpel2020-03-081-4/+2
| * | | changelogdklimpel2020-03-082-4/+10
| * | | Add options to disable setting profile info for prevent changes.dklimpel2020-03-082-0/+21
| | |/ | |/|
* | | Rephrase default messageBrendan Abolivier2020-03-101-2/+2
* | | Hopefully mypy is happy nowBrendan Abolivier2020-03-102-3/+10
* | | Attempt at appeasing the gods of mypyBrendan Abolivier2020-03-101-1/+1
* | | LintBrendan Abolivier2020-03-101-1/+1
* | | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-103-2/+62
* | | Merge pull request #7055 from matrix-org/babolivier/get_time_of_last_push_act...Brendan Abolivier2020-03-092-18/+20
|\ \ \
| * | | Fix undefined `room_id` in `make_summary_text`Brendan Abolivier2020-03-091-1/+3
| * | | Move `get_time_of_last_push_action_before` to the `EventPushActionsWorkerStore`Brendan Abolivier2020-03-091-17/+17
* | | | Remove special auth and redaction rules for aliases events in experimental ro...Patrick Cloke2020-03-095-19/+22
* | | | Merge pull request #7045 from matrix-org/babolivier/room_keys_checkBrendan Abolivier2020-03-091-0/+7
|\ \ \ \
| * | | | LintBrendan Abolivier2020-03-061-2/+1
| * | | | Mention the session ID in the error messageBrendan Abolivier2020-03-061-2/+3
| * | | | LintBrendan Abolivier2020-03-061-1/+2
| * | | | Make sure that is_verified is a boolean when processing room keysBrendan Abolivier2020-03-061-0/+6
| |/ / /
* | | | Add type hints to logging/context.py (#6309)Neil Pilgrim2020-03-071-47/+74
* | | | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-062-1/+44
|/ / /
* | | Convert remote key resource REST layer to async/await. (#7020)Patrick Cloke2020-03-051-7/+4
* | | Store room_versions in EventBase objects (#6875)Richard van der Hoff2020-03-054-32/+62
* | | Hide extremities dummy events from clientsBrendan Abolivier2020-03-041-0/+3
* | | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-042-40/+76
* | | Read the room version from database when fetching events (#6874)Richard van der Hoff2020-03-041-16/+68
* | | Merge branch 'master' into developBrendan Abolivier2020-03-039-34/+219
|\ \ \
| * | | v1.11.1Brendan Abolivier2020-03-031-1/+1
| * | | Fix wrong handler being used in SAML handlerBrendan Abolivier2020-03-031-3/+2
| * | | Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-034-57/+96
| * | | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-022-8/+36
| * | | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-022-10/+12
| |\ \ \
| | * | | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-022-10/+12
| * | | | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-025-6/+126
| |/ / /
* | / / Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-034-15/+62
| |/ / |/| |
* | | Always return a deferred from `get_current_state_deltas`. (#7019)Erik Johnston2020-03-021-1/+3
* | | Add some type annotations to the federation base & client classes (#6995)Patrick Cloke2020-02-282-28/+42
| |/ |/|
* | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-282-10/+12
* | Merge remote-tracking branch 'origin/release-v1.11.1' into developPatrick Cloke2020-02-271-6/+8
|\|
| * Cast a coroutine into a Deferred in the federation base (#6996)Patrick Cloke2020-02-261-6/+8
* | Don't refuse to start worker if media listener configured. (#7002)Erik Johnston2020-02-271-14/+20
* | Add some type annotations in `synapse.storage` (#6987)Richard van der Hoff2020-02-276-82/+266
* | Store room version on invite (#6983)Richard van der Hoff2020-02-264-2/+68
* | Port PresenceHandler to async/await (#6991)Erik Johnston2020-02-264-109/+99
* | Updated warning for incorrect database collation/ctype (#6985)Uday Bansal2020-02-261-3/+7
* | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error hand...Andrew Morgan2020-02-262-4/+8
* | Sanity-check database before running upgrades (#6982)Richard van der Hoff2020-02-252-17/+32
* | Merge worker apps into one. (#6964)Erik Johnston2020-02-2513-2317/+1045
* | Remove redundant store_room call (#6979)Richard van der Hoff2020-02-241-23/+0
* | Upsert room version when we join over federation (#6968)Richard van der Hoff2020-02-242-10/+29
* | Fix minor issues with email config (#6962)Richard van der Hoff2020-02-241-36/+30
* | No longer use room alias events to calculate room names for push notification...Patrick Cloke2020-02-211-22/+14
* | Change displayname of user as admin in rooms (#6876)Dirk Klimpel2020-02-211-1/+11
* | Stop returning aliases as part of the room list. (#6970)Patrick Cloke2020-02-211-9/+0
* | Publishing/removing from the directory requires a power level greater than ca...Patrick Cloke2020-02-211-5/+5
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-2153-168/+159
* | Merge pull request #6967 from matrix-org/rav/increase_max_events_behindRichard van der Hoff2020-02-211-1/+1
|\ \
| * | Increase MAX_EVENTS_BEHIND for replication clientsErik Johnston2020-02-211-1/+1
* | | Merge branch 'master' into developRichard van der Hoff2020-02-212-6/+6
|\ \ \ | |/ / |/| / | |/
| * 1.11.0 v1.11.0 github/release-v1.11.0 release-v1.11.0Richard van der Hoff2020-02-211-1/+1
| * Small grammar fixes to the ACME v1 deprecation notice (#6944)Andrew Morgan2020-02-211-5/+5
* | Do not send alias events when creating / upgrading a room (#6941)Patrick Cloke2020-02-202-40/+15
* | don't insert into the device table for remote cross-signing keys (#6956)Hubert Chathi2020-02-201-15/+18
* | Add some clarifications to README.md in the database schema directory. (#6615)Ruben Barkow-Kuder2020-02-201-8/+16
* | Minor perf fixes to `get_auth_chain_ids`.Erik Johnston2020-02-192-7/+5
* | Freeze allocated objects on startup. (#6953)Erik Johnston2020-02-191-0/+9
* | Reduce auth chains fetched during v2 state res. (#6952)Erik Johnston2020-02-193-11/+34
|/
* 1.11.0rc1Richard van der Hoff2020-02-191-1/+1
* Revert `get_auth_chain_ids` changes (#6951)Erik Johnston2020-02-191-28/+0
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-197-84/+77
|\
| * Make room alias lists peekableRichard van der Hoff2020-02-191-1/+3
| * Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-195-15/+33
| * Refactor the membership check methods in AuthRichard van der Hoff2020-02-183-71/+44
* | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-192-1/+9
* | Tiny optimisation for _get_handler_for_request (#6950)Richard van der Hoff2020-02-191-1/+3
* | Increase DB/CPU perf of `_is_server_still_joined` check. (#6936)Erik Johnston2020-02-192-15/+59
* | Merge pull request #6945 from matrix-org/babolivier/fix-retention-debug-logBrendan Abolivier2020-02-191-1/+1
|\ \
| * | Fix log in message retention purge jobsBrendan Abolivier2020-02-181-1/+1
* | | Limit size of get_auth_chain_ids query (#6947)Erik Johnston2020-02-191-18/+23
| |/ |/|
* | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-182-1/+39
* | Merge pull request #6872 from matrix-org/rav/dictpropertyRichard van der Hoff2020-02-181-81/+118
|\ \
| * | Rewrite _EventInternalMetadata to back it with a _dictRichard van der Hoff2020-02-141-16/+39
| * | Replace _event_dict_property with DictPropertyRichard van der Hoff2020-02-141-65/+79
* | | Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-182-1/+34
|\ \ \ | |_|/ |/| |
| * | Make the log more noticeableBrendan Abolivier2020-02-181-1/+2
| * | Print the error as an error log and raise the same exception we gotBrendan Abolivier2020-02-181-9/+10
| * | Linters are hard but in they end they just want what's best for usBrendan Abolivier2020-02-131-1/+1
| * | LintBrendan Abolivier2020-02-131-6/+7
| * | LintBrendan Abolivier2020-02-131-7/+6
| * | Add a separator for the config warningBrendan Abolivier2020-02-131-1/+1
| * | Add a comprehensive error when failing to register for an ACME accountBrendan Abolivier2020-02-131-1/+13
| * | Add mention and warning about ACME v1 deprecation to the Synapse configBrendan Abolivier2020-02-131-0/+19
* | | Increase perf of `get_auth_chain_ids` used in state res v2. (#6937)Erik Johnston2020-02-181-0/+23
* | | Stop sending events when creating or deleting aliases (#6904)Patrick Cloke2020-02-182-40/+41
* | | Merge branch 'master' into developRichard van der Hoff2020-02-171-1/+1
|\ \ \
| * | | 1.10.1 v1.10.1 github/release-v1.10.1 release-v1.10.1Richard van der Hoff2020-02-171-1/+1
| * | | wait for current_state_events_membership before delete_old_current_state_even...Richard van der Hoff2020-02-171-2/+5
* | | | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-171-1/+9
* | | | wait for current_state_events_membership before delete_old_current_state_even...Richard van der Hoff2020-02-171-2/+5
* | | | Add type hints to the spam check module (#6915)Patrick Cloke2020-02-142-22/+34
* | | | Add a warning about indentation to generated config (#6920)Richard van der Hoff2020-02-141-2/+14
| |_|/ |/| |
* | | Filter the results of user directory searching via the spam checker (#6888)Patrick Cloke2020-02-142-2/+39
* | | Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 (#...Aaron Raimist2020-02-131-1/+0
| |/ |/|
* | Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-121-1/+4
* | Merge branch 'master' into developBrendan Abolivier2020-02-121-1/+1
|\|
| * 1.10.0Brendan Abolivier2020-02-121-1/+1
* | Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-111-1/+1
|\|
| * 1.10.0rc5 v1.10.0rc5Richard van der Hoff2020-02-111-1/+1
* | Merge branch 'release-v1.10.0' into developRichard van der Hoff2020-02-112-1/+2
|\|
| * 1.10.0rc4Richard van der Hoff2020-02-111-1/+1
| * filter out m.room.aliases from /sync state blocks (#6884)Matthew Hodgson2020-02-101-0/+1
* | Reject device display names that are too long (#6882)Patrick Cloke2020-02-101-1/+13
* | Merge tag 'v1.10.0rc3' into developRichard van der Hoff2020-02-102-1/+8
|\|
| * 1.10.0rc3 v1.10.0rc3Richard van der Hoff2020-02-101-1/+1
| * filter out m.room.aliases from the CS API until a better solution is specced ...Matthew Hodgson2020-02-101-0/+7
* | Add support for putting fed user query API on workers (#6873)Erik Johnston2020-02-073-21/+23
* | Remove unused `get_room_stats_state` method. (#6869)Richard van der Hoff2020-02-071-25/+0
* | Add a `make_event_from_dict` method (#6858)Richard van der Hoff2020-02-073-12/+19
* | Add typing to synapse.federation.sender (#6871)Erik Johnston2020-02-076-105/+130
* | Allow moving group read APIs to workers (#6866)Erik Johnston2020-02-077-687/+713
* | Admin api to add an email address (#6789)Dirk Klimpel2020-02-073-0/+49
* | remove unused room_version_to_event_format (#6857)Richard van der Hoff2020-02-071-23/+1
* | Merge pull request #6856 from matrix-org/rav/redact_changes/6Richard van der Hoff2020-02-073-58/+46
|\ \
| * | Pass room_version into `event_from_pdu_json`Richard van der Hoff2020-02-063-58/+46
* | | Limit the number of events that can be requested when backfilling events (#6864)Patrick Cloke2020-02-061-0/+4
|/ /
* | pass room version into FederationClient.send_join (#6854)Richard van der Hoff2020-02-062-30/+33
* | Allow empty federation_certificate_verification_whitelist (#6849)timfi2020-02-061-0/+2
* | Third party event rules Update (#6781)PeerD2020-02-062-4/+9
* | Reduce amount of logging at INFO level. (#6862)Erik Johnston2020-02-0611-21/+21
* | Merge pull request #6823 from matrix-org/rav/redact_changes/5Richard van der Hoff2020-02-062-19/+13
|\ \
| * | Simplify `room_version` handling in `FederationClient.send_invite`Richard van der Hoff2020-02-051-10/+6
| * | Pass room version object into `FederationClient.get_pdu`Richard van der Hoff2020-02-052-9/+7
* | | Merge tag 'v1.10.0rc2' into developErik Johnston2020-02-067-22/+73
|\ \ \ | |/ / |/| / | |/
| * 1.10.0rc2Erik Johnston2020-02-061-1/+1
| * Check sender_key matches on inbound encrypted events. (#6850)Erik Johnston2020-02-052-14/+66
| * Merge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fedHubert Chathi2020-02-051-0/+10
| * Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-045-7/+6
* | Merge pull request #6840 from matrix-org/rav/federation_client_asyncRichard van der Hoff2020-02-051-136/+142
|\ \
| * | make FederationClient._do_send_invite asyncRichard van der Hoff2020-02-051-10/+7
| * | Apply suggestions from code reviewRichard van der Hoff2020-02-051-2/+4
| * | Merge remote-tracking branch 'origin/develop' into rav/federation_client_asyncRichard van der Hoff2020-02-043-348/+379
| |\ \
| * | | make FederationClient.send_invite asyncRichard van der Hoff2020-02-031-6/+5
| * | | make FederationClient.get_missing_events asyncRichard van der Hoff2020-02-031-20/+20
| * | | make FederationClient._do_send_leave asyncRichard van der Hoff2020-02-031-4/+3