summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-251-1/+5
|\
| * Log tracebacks correctlyErik Johnston2019-02-251-1/+5
* | Fix typoErik Johnston2019-02-251-1/+1
* | More commentsErik Johnston2019-02-251-0/+4
* | Assert rather than clobber the valuesErik Johnston2019-02-251-2/+2
* | Add comments and paranoiaErik Johnston2019-02-251-2/+23
* | Fix backfill storing incorrect state for eventsErik Johnston2019-02-221-1/+4
|/
* Run push_receipts_to_remotes as background job (#4707)Richard van der Hoff2019-02-211-34/+34
* Merge pull request #4263 from rkfg/developErik Johnston2019-02-211-1/+1
|\
| * Prevent crash on pagination.rkfg2018-12-061-1/+1
* | Fix registration on workers (#4682)Erik Johnston2019-02-203-8/+196
* | Merge pull request #4652 from matrix-org/babolivier/acme-delegatedBrendan Abolivier2019-02-191-4/+5
|\ \
| * | Fetch ACME domain into an instance memberBrendan Abolivier2019-02-191-4/+5
| * | Use a configuration parameter to give the domain to generate a certificate forBrendan Abolivier2019-02-181-25/+4
| * | Merge branch 'develop' into babolivier/acme-delegatedBrendan Abolivier2019-02-183-10/+35
| |\ \
| * | | Typo in info logAndrew Morgan2019-02-181-1/+1
| * | | Various cosmetics to make TravisCI happyBrendan Abolivier2019-02-151-2/+5
| * | | Remove unused importBrendan Abolivier2019-02-151-1/+0
| * | | Support .well-known delegation when issuing certificates through ACMEBrendan Abolivier2019-02-151-4/+23
* | | | Merge pull request #4642 from matrix-org/anoa/bans_room_upgradeAndrew Morgan2019-02-191-0/+22
|\ \ \ \
| * | | | lintAndrew Morgan2019-02-181-1/+3
| * | | | Move member event processing and changelog fixAndrew Morgan2019-02-181-9/+7
| * | | | Membership events are done laterAndrew Morgan2019-02-181-12/+20
| * | | | Transfer bans on room upgradeAndrew Morgan2019-02-181-0/+14
| |/ / /
* | | | Merge pull request #4666 from matrix-org/erikj/register_login_splitErik Johnston2019-02-181-8/+106
|\ \ \ \
| * | | | Move register_device into handlerErik Johnston2019-02-181-4/+47
| * | | | Split out registration to workerErik Johnston2019-02-181-4/+59
* | | | | Merge pull request #4668 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-181-5/+9
|\ \ \ \ \
| * | | | | pep8Erik Johnston2019-02-181-1/+5
| * | | | | Correctly handle HttpResponseExceptionErik Johnston2019-02-181-4/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workersErik Johnston2019-02-181-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix kicking guest users in worker modeErik Johnston2019-02-181-1/+1
| |/ / /
* | | | Merge pull request #4643 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-182-5/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Correctly handle RequestSendFailed exceptionsErik Johnston2019-02-142-5/+11
| |/ /
* | | Only fetch aliases when publishing roomsErik Johnston2019-02-141-15/+15
* | | Add configurable room list publishing rulesErik Johnston2019-02-141-5/+24
|/ /
* | Run `black` on user directory code (#4635)Amber Brown2019-02-131-44/+50
* | Merge pull request #4608 from matrix-org/anoa/acls_room_upgradeErik Johnston2019-02-121-0/+1
|\ \
| * | Transfer Server ACLs on room upgradeAndrew Morgan2019-02-111-0/+1
* | | make sure version is in body and wrap in linearizer queueHubert Chathi2019-02-081-11/+26
* | | re-try to make isort happyHubert Chathi2019-02-061-1/+1
* | | fix import to make isort happyHubert Chathi2019-02-061-2/+7
* | | add new endpoint to update backup versionsHubert Chathi2019-02-061-1/+33
* | | return proper error codes for some 404sHubert Chathi2019-02-061-4/+16
|/ /
* | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatableAndrew Morgan2019-01-311-0/+10
|\ \
| * | New function for getting room's create eventAndrew Morgan2019-01-311-7/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad...Andrew Morgan2019-01-311-1/+13
| |\ \
| * | | lintAndrew Morgan2019-01-311-2/+4
| * | | Copy over non-federatable trait on room upgradeAndrew Morgan2019-01-301-0/+14
* | | | Add some debug for membership syncing issues (#4538)Richard van der Hoff2019-01-311-2/+11
| |/ / |/| |
* | | Fix remote invite rejections not comming down syncErik Johnston2019-01-301-1/+13
|/ /
* | ACME config cleanups (#4525)Richard van der Hoff2019-01-301-12/+15
* | Fix flake8 (#4519)Amber Brown2019-01-302-3/+3
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-292-1/+10
|\ \
| * | Use snder and not event ID domain to check if oursErik Johnston2019-01-291-0/+8
| * | Remove event ID usage when checking if new roomErik Johnston2019-01-291-1/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-292-29/+7
|\| |
| * | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-291-28/+6
| |\ \
| | * | Correctly set context.app_serviceErik Johnston2019-01-291-0/+2
| | * | Refactor event building into EventBuilderErik Johnston2019-01-291-29/+5
| * | | Fixup calls to `comput_event_signature`Erik Johnston2019-01-291-1/+1
| |/ /
* / / Implement rechecking of redactionsErik Johnston2019-01-291-1/+5
|/ /
* | Merge pull request #4494 from matrix-org/erikj/fixup_event_validatorErik Johnston2019-01-292-3/+8
|\ \
| * | Split up event validation between event and builderErik Johnston2019-01-282-3/+8
* | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-283-11/+23
|\ \ \ | |/ / |/| |
| * | Correctly use default room version if none is setErik Johnston2019-01-281-2/+2
| * | Pass through room version to event authErik Johnston2019-01-253-10/+22
* | | Change return syntax in doc stringAndrew Morgan2019-01-281-1/+1
* | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-282-29/+53
|\| |
| * | Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-252-29/+53
| |\ \
| | * | Require event format version to parse or create eventsErik Johnston2019-01-252-29/+53
* | | | Reuse predecessor methodAndrew Morgan2019-01-281-12/+8
* | | | FixesAndrew Morgan2019-01-251-39/+39
* | | | Clean up direct_rooms accessAndrew Morgan2019-01-251-3/+3
* | | | Use python magicAndrew Morgan2019-01-251-2/+1
* | | | Destructure account data tuple before useAndrew Morgan2019-01-251-3/+3
* | | | Remove unnecessary null checkAndrew Morgan2019-01-251-7/+6
* | | | Move room_tag declaration to be closer to its useAndrew Morgan2019-01-251-4/+5
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-255-34/+231
|\| | |
| * | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-251-0/+47
| |\ \ \ | | |/ / | |/| |
| | * | Apply suggestions from code reviewRichard van der Hoff2019-01-241-1/+1
| | * | Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-221-32/+10
| | * | Search for messages across predecessor roomsAndrew Morgan2019-01-181-0/+69
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-254-33/+183
| |\ \ \
| | * \ \ Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-241-2/+15
| | |\ \ \
| | | * | | Review commentsErik Johnston2019-01-241-0/+5
| | | * | | Add room_version param to get_pduErik Johnston2019-01-231-2/+10
| | * | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-241-29/+3
| | |\ \ \ \
| | | * | | | Remove unecessary setting of outlier bitErik Johnston2019-01-241-2/+0
| | | * | | | Use term 'out of band membership' insteadErik Johnston2019-01-241-2/+2
| | | * | | | Clarify the invite flowsErik Johnston2019-01-231-1/+11
| | | * | | | Remove unnecessary '_sign_event'Erik Johnston2019-01-231-14/+0
| | | * | | | Store rejected remote invite events as outliersErik Johnston2019-01-231-32/+12
| | | |/ / /
| | * | | | Change default timeout value from 0 to NoneAndrew Morgan2019-01-241-1/+1
| | * | | | Use self.clock instead of datetimeAndrew Morgan2019-01-241-4/+3
| | * | | | isortAndrew Morgan2019-01-241-1/+1
| | * | | | lintAndrew Morgan2019-01-241-1/+2
| | * | | | Time out filtered room dir queries after 60sAndrew Morgan2019-01-241-2/+12
| | |/ / /
| | * | | Add metric for user dir current event stream positionAndrew Morgan2019-01-231-0/+6
| | * | | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-231-0/+147
| * | | | Implement MSC 1813 - Add room version to make APIsErik Johnston2019-01-231-1/+1
| |/ / /
* | | | Move tag and direct state copying into separate functionAndrew Morgan2019-01-251-43/+63
* | | | lintAndrew Morgan2019-01-221-1/+3
* | | | Prevent duplicate room IDs in m.directAndrew Morgan2019-01-221-10/+9
* | | | Fix commentsAndrew Morgan2019-01-221-2/+2
* | | | Join logic covers both room creator and arbitrary usersAndrew Morgan2019-01-221-33/+0
* | | | tags, m.direct copying over correctlyAndrew Morgan2019-01-222-11/+62
* | | | Fix typosAndrew Morgan2019-01-221-8/+8
* | | | Migrating dm and room tags work for migratorAndrew Morgan2019-01-221-2/+13
* | | | Prevent crash on user who doesn't have any direct roomsAndrew Morgan2019-01-221-1/+1
* | | | Preserve DM status of a room on upgradeAndrew Morgan2019-01-221-0/+19
* | | | Fix typoAndrew Morgan2019-01-221-2/+2
|/ / /
* / / Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-211-0/+1
|/ /
* | sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-171-3/+6
* | don't store more remote device lists if they have more than 1K devices (#4397)Richard van der Hoff2019-01-161-0/+19
* | fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-021-10/+11
* | Fixed line lengthNathan Pennie2018-12-191-1/+5
* | Fix the variable names used for account_dataNathan Pennie2018-12-191-3/+3
* | create support user (#4141)Neil Johnson2018-12-143-23/+39
* | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-7/+16
* | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-071-2/+11
* | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-061-29/+0
|/
* Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-041-0/+3
* Neilj/fix autojoin (#4223)Neil Johnson2018-11-281-2/+21
* Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-151-1/+1
* Remove hack to support rejoining roomsErik Johnston2018-11-091-74/+42
* Simplify to always drop events if server isn't in the roomErik Johnston2018-11-091-14/+9
* Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-061-1/+1
* handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-051-7/+15
* Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-061-24/+24
* Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-031-4/+10
* Include a version query string arg for the consent routeTravis Ralston2018-10-311-1/+4
* Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-318-133/+515
|\
| * Merge pull request #4101 from matrix-org/rav/aliases_for_upgradesRichard van der Hoff2018-10-312-14/+140
| |\
| | * Avoid else clause on exception for clarityRichard van der Hoff2018-10-311-2/+1
| | * Attempt to move room aliases on room upgradesRichard van der Hoff2018-10-312-14/+141
| * | Log some bits about event creation (#4121)Richard van der Hoff2018-10-312-0/+7
| * | Fix search 500ing (#4122)Amber Brown2018-10-311-2/+6
| * | Delete the disused & unspecced identicon functionality (#4106)Amber Brown2018-10-291-3/+0
| |/
| * Merge pull request #4100 from matrix-org/rav/room_upgrade_avatarRichard van der Hoff2018-10-291-1/+2
| |\
| | * Remember to copy the avatar on room upgradesRichard van der Hoff2018-10-261-1/+2
| * | Better handling of odd PLs during room upgradesRichard van der Hoff2018-10-271-44/+81
| |/
| * optimise state copyingRichard van der Hoff2018-10-261-7/+5
| * Address review commentsRichard van der Hoff2018-10-261-7/+9
| * restrict PLs in old roomRichard van der Hoff2018-10-251-1/+43
| * copy stateRichard van der Hoff2018-10-251-11/+26
| * preserve PLsRichard van der Hoff2018-10-251-1/+7
| * preserve room visibilityRichard van der Hoff2018-10-251-3/+5
| * Basic initial support for room upgradesRichard van der Hoff2018-10-251-0/+121
| * Allow power_level_content_override=None for _send_events_for_new_roomRichard van der Hoff2018-10-251-5/+6
| * Make room_member_handler a member of RoomCreationHandlerRichard van der Hoff2018-10-252-8/+7
| * Factor _generate_room_id out of create_roomRichard van der Hoff2018-10-251-22/+23
| * Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-255-86/+72
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-258-43/+79
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-2513-103/+440
| | |\
| | * | remove trailing whiter spaceNeil Johnson2018-10-241-1/+1
| | * | fix tupleRichard van der Hoff2018-10-241-1/+2
| | * | remove errant exception and styleNeil Johnson2018-10-231-5/+5
| | * | clean up config error logic and importsNeil Johnson2018-10-171-14/+16
| | * | no need to join room if creatorNeil Johnson2018-10-131-1/+2
| | * | improve auto room join logic, comments and testsNeil Johnson2018-10-121-3/+8
| | * | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-045-42/+74
| | |\ \
| | * | | move logic into register, fix room alias localpart bug, testsNeil Johnson2018-10-041-27/+18
| | * | | emit room aliases eventMatthew Hodgson2018-09-291-3/+8
| | * | | fix thinkosMatthew Hodgson2018-09-291-6/+6
| | * | | fix UTsMatthew Hodgson2018-09-281-4/+9
| | * | | untested stab at autocreating autojoin roomsMatthew Hodgson2018-09-281-0/+18
| * | | | Add config option to control alias creationErik Johnston2018-10-191-0/+9
* | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-249-74/+100
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-241-15/+15
| |\ \ \ \
| | * | | | CommentErik Johnston2018-10-241-2/+5
| | * | | | Rename resolve_events_with_factoryErik Johnston2018-10-241-2/+2
| | * | | | Fix up use of resolve_events_with_factoryErik Johnston2018-10-161-13/+10
| * | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontextsRichard van der Hoff2018-10-243-4/+4
| |\ \ \ \ \
| | * | | | | Remove redundant run_as_background_process() from pusherpoolRichard van der Hoff2018-10-223-4/+4
| * | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creationErik Johnston2018-10-242-32/+50
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Clean up room alias creationErik Johnston2018-10-192-32/+50
| | |/ / / /
| * | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-231-2/+16
| |\ \ \ \ \
| | * | | | | Comments helpTravis Ralston2018-10-231-0/+5
| | * | | | | isortTravis Ralston2018-10-121-1/+1
| | * | | | | More sane handling of group errors and pep8Travis Ralston2018-10-121-4/+5
| | * | | | | Merge branch 'develop' into travis/fix-federated-group-requestsTravis Ralston2018-10-127-91/+181
| | |\ \ \ \ \
| | * | | | | | Remove debugging statementTravis Ralston2018-09-261-1/+0
| | * | | | | | Handle HttpResponseException more safely for federated groupsTravis Ralston2018-09-261-2/+11
| * | | | | | | Give some more things logcontexts (#4077)Richard van der Hoff2018-10-232-7/+11
| * | | | | | | Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-231-14/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-182-9/+14
|\| | | | | |
| * | | | | | Fix roomlist since tokens on Python 3 (#4046)Will Hunt2018-10-171-2/+9
| * | | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-161-7/+5
| | |_|/ / / | |/| | | |
* | | | | | pep8Travis Ralston2018-10-151-1/+1
* | | | | | Ensure the terms params are actually providedTravis Ralston2018-10-151-0/+1
* | | | | | Python is hardTravis Ralston2018-10-151-5/+6
* | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-151-0/+289
|\| | | | |
| * | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backupsDavid Baker2018-10-151-0/+289
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Linting soothes the savage PEP8 monsterDavid Baker2018-10-121-4/+9
| | * | | | PR feedback pt. 1David Baker2018-10-121-20/+21
| | * | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-0913-205/+498
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Apparently this blank line is Very ImportantDavid Baker2018-10-091-0/+1
| | * | | | be python3 compatibleDavid Baker2018-10-091-2/+3
| | * | | | try to make flake8 and isort happyHubert Chathi2018-09-061-1/+1
| | * | | | update to newer Synapse APIsHubert Chathi2018-08-241-1/+1
| | * | | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-2420-168/+546
| | |\ \ \ \
| | * | | | | support DELETE /version with no argsMatthew Hodgson2018-08-121-1/+1
| | * | | | | implement remaining tests and make them workMatthew Hodgson2018-08-121-7/+28
| | * | | | | switch get_current_version_info back to being get_version_infoMatthew Hodgson2018-08-121-4/+7
| | * | | | | fix flakesMatthew Hodgson2018-08-121-2/+2
| | * | | | | fix typosMatthew Hodgson2018-08-121-1/+2
| | * | | | | add a tonne of docstring; make upload_room_keys properly assert versionMatthew Hodgson2018-08-121-8/+103
| | * | | | | more docstring for the e2e_room_keys restMatthew Hodgson2018-08-121-2/+0
| | * | | | | fix factoring out of _should_replace_room_keyMatthew Hodgson2018-08-121-3/+4
| | * | | | | rename room_key_version table correctly, and fix opt argsMatthew Hodgson2018-08-121-3/+3
| | * | | | | blindly incorporate PR review - needs testing & fixingMatthew Hodgson2018-08-121-30/+58
| | * | | | | make /room_keys/version workMatthew Hodgson2018-08-121-7/+11
| | * | | | | implement /room_keys/version too (untested)Matthew Hodgson2018-08-121-5/+42
| | * | | | | make it work and fix pep8Matthew Hodgson2018-08-121-26/+43
| | * | | | | interim WIP checkin; doesn't build yetMatthew Hodgson2018-08-121-15/+31
| | * | | | | total WIP skeleton for /room_keys APIMatthew Hodgson2018-08-121-0/+60
* | | | | | | Update login terms structure for the proposed language supportTravis Ralston2018-10-121-4/+7
* | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-122-20/+37
|\| | | | | |
| * | | | | | Add description to counter metricErik Johnston2018-10-101-1/+5
| * | | | | | Track number of non-empty sync responses insteadErik Johnston2018-10-101-9/+15
| * | | | | | Append _total to metric and fix up spellingErik Johnston2018-10-101-2/+2
| * | | | | | Add metric to count lazy member sync requestsErik Johnston2018-10-091-6/+20
| * | | | | | Remove unnecessary extra function call layerErik Johnston2018-10-081-15/+3
| * | | | | | Use errback pattern and catch async failuresErik Johnston2018-10-081-1/+6
| | |_|/ / / | |/| | | |
* | | | | | Use a flag rather than a new route for the public policyTravis Ralston2018-10-031-1/+1
* | | | | | Supply params for terms auth stageTravis Ralston2018-10-031-0/+9
* | | | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-031-0/+4
|/ / / / /
* | | | | Fix exception handling in fetching remote profilesErik Johnston2018-10-031-6/+2
* | | | | Merge pull request #3989 from matrix-org/rav/better_stacktracesRichard van der Hoff2018-10-022-22/+23
|\ \ \ \ \
| * | | | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-012-22/+23
* | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-021-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix lazy loaded sync with rejected state eventsErik Johnston2018-10-011-2/+2
* | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-011-12/+46
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-273-5/+21
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Include event when resolving state for missing prevsRichard van der Hoff2018-09-271-2/+16
| * | | | | Include state from remote servers in pdu handlingRichard van der Hoff2018-09-271-4/+19
| * | | | | Fix "unhashable type: 'list'" exception in federation handlingRichard van der Hoff2018-09-271-7/+12
* | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-281-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix complete fail to do the right thingRichard van der Hoff2018-09-281-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3794 from matrix-org/erikj/faster_typingRichard van der Hoff2018-09-271-3/+19
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typingErik Johnston2018-09-1910-70/+198
| |\ \ \ \ \
| * | | | | | Improve performance of getting typing updates for replicationErik Johnston2018-09-051-3/+19
* | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanupsRichard van der Hoff2018-09-271-2/+10
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | more commentsRichard van der Hoff2018-09-271-4/+3
| * | | | | | Clarifications in FederationHandlerRichard van der Hoff2018-09-271-2/+11
* | | | | | | Merge pull request #3970 from schnuffle/develop-py3Amber Brown2018-09-272-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Replaced all occurences of e.message with str(e)Schnuffle2018-09-272-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-271-0/+4
|\ \ \ \ \ \
| * | | | | | Logging improvementsRichard van der Hoff2018-09-261-0/+4
| |/ / / / /