summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4736 from matrix-org/anoa/public_rooms_federateAndrew Morgan2019-02-264-17/+70
|\
| * Cleaner chunk logicAndrew Morgan2019-02-261-5/+4
| * Correct indentAndrew Morgan2019-02-261-3/+3
| * Correct docstring types and chunk logicAndrew Morgan2019-02-261-10/+11
| * Clean up room chunk logicAndrew Morgan2019-02-261-6/+8
| * Make not showing non-federated rooms the defaultAndrew Morgan2019-02-262-13/+1
| * Result may be NoneAndrew Morgan2019-02-261-1/+1
| * Address rich commentsAndrew Morgan2019-02-262-7/+31
| * Fix group's call to generate_room_entryAndrew Morgan2019-02-251-4/+2
| * elif not else ifAndrew Morgan2019-02-251-1/+1
| * syntax derpAndrew Morgan2019-02-251-1/+1
| * Simplify call to generate_room_entryAndrew Morgan2019-02-251-17/+13
| * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Erik Johnston2019-02-25192-4516/+9135
| |\
| * | Docs and arg name clarificationAndrew Morgan2019-02-251-2/+15
| * | Don't restrict non-fed rooms over client APIsAndrew Morgan2019-02-253-14/+22
| * | Config option to prevent showing non-fed rooms in fed /publicRoomsAndrew Morgan2019-02-252-2/+26
* | | Don't log stack trace when client has gone away during media download (#4738)Erik Johnston2019-02-251-2/+9
* | | Fix ACME config for python 2. (#4717)Richard van der Hoff2019-02-251-3/+7
* | | switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-254-5/+5
* | | Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-253-7/+12
|\ \ \
| * | | Log tracebacks correctlyErik Johnston2019-02-253-7/+12
| | |/ | |/|
* | | Merge pull request #4718 from matrix-org/erikj/fix_backfill_state_shredErik Johnston2019-02-251-3/+31
|\ \ \
| * | | 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
* | | | Merge pull request #4721 from matrix-org/erikj/msc_1866Erik Johnston2019-02-252-2/+26
|\ \ \ \
| * | | | MSC 1866 - Use M_UNSUPPORTED_ROOM_VERSION for invite APIErik Johnston2019-02-232-2/+26
* | | | | Merge pull request #4722 from matrix-org/erikj/correctly_handle_keyring_excep...Erik Johnston2019-02-251-21/+51
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | raise_from already raisesErik Johnston2019-02-251-4/+4
| * | | | Handle errors when fetching remote server keysErik Johnston2019-02-231-21/+51
| |/ / /
* / / / Correctly proxy exception in frontend_proxy workerErik Johnston2019-02-231-5/+10
|/ / /
* | | Merge pull request #4716 from matrix-org/erikj/pusher_loggingErik Johnston2019-02-223-1/+16
|\ \ \
| * | | Add missing returnErik Johnston2019-02-221-0/+1
| * | | Correctly handle PusherConfigExceptionErik Johnston2019-02-221-0/+9
| * | | Drop logging level of creating a pusherErik Johnston2019-02-221-1/+1
| * | | Correctly handle null data in HttpPusherErik Johnston2019-02-221-0/+5
| |/ /
* / / Fix state cache invalidation on workersErik Johnston2019-02-222-12/+35
|/ /
* | Add prometheus metrics for number of badge update pushes. (#4709)Richard van der Hoff2019-02-221-8/+25
* | bail out early in on_new_receipts if no pushers (#4706)Richard van der Hoff2019-02-211-0/+8
* | 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
* | | Merge pull request #4694 from matrix-org/erikj/fix_sentry_config_formatErik Johnston2019-02-201-0/+2
|\ \ \
| * | | Fixup generated metrics configErik Johnston2019-02-201-0/+2
* | | | Add metrics for number of outgoing EDUs, by type (#4695)Richard van der Hoff2019-02-202-6/+18
* | | | UPSERT many functionality (#4644)Amber Brown2019-02-201-12/+134
* | | | Logging improvements for the pusher (#4691)Richard van der Hoff2019-02-202-13/+14
* | | | Fix TaskStopped exceptions when outbound requests time out (#4690)Richard van der Hoff2019-02-203-18/+29
* | | | Merge pull request #4678 from matrix-org/rav/tls_install_instructionsRichard van der Hoff2019-02-2024-196/+248
|\ \ \ \ | |/ / / |/| | |
| * | | Attempt to make default config more consistentRichard van der Hoff2019-02-1924-196/+248
* | | | Fix registration on workers (#4682)Erik Johnston2019-02-2012-150/+275
* | | | Merge pull request #4671 from matrix-org/erikj/state_cache_invalidationErik Johnston2019-02-193-32/+70
|\ \ \ \ | |/ / / |/| | |
| * | | DocsErik Johnston2019-02-191-2/+3
| * | | Use itertoolsErik Johnston2019-02-191-2/+2
| * | | DocumentationErik Johnston2019-02-191-4/+4
| * | | Batch cache invalidation over replicationErik Johnston2019-02-183-32/+69
* | | | Merge pull request #4652 from matrix-org/babolivier/acme-delegatedBrendan Abolivier2019-02-192-4/+20
|\ \ \ \
| * | | | Improve config documentationBrendan Abolivier2019-02-191-3/+11
| * | | | 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-182-25/+11
| * | | | Merge branch 'develop' into babolivier/acme-delegatedBrendan Abolivier2019-02-188-40/+213
| |\ \ \ \
| * | | | | 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 #4670 from matrix-org/erikj/register_login_splitErik Johnston2019-02-192-41/+43
|\ \ \ \ \ \
| * | | | | | Split /login into client_readerErik Johnston2019-02-182-41/+43
* | | | | | | Try and make TLS federation client code faster (#4674)Richard van der Hoff2019-02-191-8/+6
|\ \ \ \ \ \ \
| * | | | | | | fix to use makeContext so that we don't need to rebuild the certificateoption...Amber Brown2019-02-191-8/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | 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 #4632 from matrix-org/erikj/basic_sentryErik Johnston2019-02-183-1/+60
|\ \ \ \ \ \ \
| * | | | | | | Fixup error handling and messageErik Johnston2019-02-181-5/+6
| * | | | | | | FixupErik Johnston2019-02-181-1/+1
| * | | | | | | Fixup comments and add warningErik Johnston2019-02-132-5/+10
| * | | | | | | CommentsErik Johnston2019-02-121-0/+8
| * | | | | | | Raise an appropriate error message if sentry_sdk missingErik Johnston2019-02-121-1/+15
| * | | | | | | Basic sentry integrationErik Johnston2019-02-123-0/+31
* | | | | | | | Merge pull request #4666 from matrix-org/erikj/register_login_splitErik Johnston2019-02-188-193/+419
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Move register_device into handlerErik Johnston2019-02-184-102/+74
| * | | | | | | Update docsErik Johnston2019-02-181-1/+1
| * | | | | | | Split out registration to workerErik Johnston2019-02-187-147/+401
* | | | | | | | 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 #4669 from matrix-org/erikj/log_exceptionErik Johnston2019-02-181-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Cleanup top level request exception loggingErik Johnston2019-02-181-3/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #4651 from matrix-org/matthew/well-known-corsErik Johnston2019-02-181-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | FixupErik Johnston2019-02-181-0/+1
| * | | | | | | | fix missig importMatthew Hodgson2019-02-181-0/+1
| * | | | | | | | tabsMatthew Hodgson2019-02-141-1/+1
| * | | | | | | | set CORS on .well-known URI to unbreak modularMatthew Hodgson2019-02-141-0/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workersErik Johnston2019-02-182-1/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix kicking guest users in worker modeErik Johnston2019-02-182-1/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4643 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-184-8/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Correctly handle RequestSendFailed exceptionsErik Johnston2019-02-144-8/+19
| | |_|/ / / | |/| | | |
* | | | | | config: Remove a repeated word from a logger warningJuuso "Linda" Lapinlampi2019-02-151-1/+1
* | | | | | Merge pull request #4647 from matrix-org/erikj/add_room_publishing_rulesErik Johnston2019-02-153-31/+193
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Move defaults up into codeErik Johnston2019-02-151-22/+44
| * | | | | Hoist up checks to reduce overall workErik Johnston2019-02-151-17/+15
| * | | | | Fixup commentsErik Johnston2019-02-151-8/+27
| * | | | | Clarify commentsErik Johnston2019-02-141-3/+3
| * | | | | Clarify and fix behaviour when there are multiple aliasesErik Johnston2019-02-141-6/+18
| * | | | | Only fetch aliases when publishing roomsErik Johnston2019-02-141-15/+15
| * | | | | Fixup commentsErik Johnston2019-02-141-8/+15
| * | | | | Add configurable room list publishing rulesErik Johnston2019-02-143-22/+126
| |/ / / /
* | | | | Merge branch 'master' into developRichard van der Hoff2019-02-143-7/+16
|\ \ \ \ \
| * | | | | 0.99.1.1 v0.99.1.1Richard van der Hoff2019-02-141-1/+1
| * | | | | Fix errors in acme provisioning (#4648)Richard van der Hoff2019-02-142-6/+15
* | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-141-2/+2
|\| | | | | | |/ / / / |/| | | |
| * | | | 0.99.1 v0.99.1Richard van der Hoff2019-02-141-2/+2
| * | | | 0.99.1rc2 v0.99.1rc2Richard van der Hoff2019-02-131-1/+1
* | | | | Merge pull request #4450 from 14mRh4X0r/fix-dependency-messageRichard van der Hoff2019-02-131-2/+5
|\ \ \ \ \
| * | | | | Fix error message for optional dependenciesWillem Mulder2019-01-231-2/+5
* | | | | | Merge remote-tracking branch 'origin/release-v0.99.1' into developRichard van der Hoff2019-02-133-22/+34
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update synapse/app/_base.pyErik Johnston2019-02-131-1/+1
| * | | | | Use `listen_tcp` for the replication listenerRichard van der Hoff2019-02-131-7/+7
| * | | | | Improve logging around listening servicesRichard van der Hoff2019-02-132-11/+20
| * | | | | Special-case the default bind_addresses for metrics listenerRichard van der Hoff2019-02-132-4/+7
* | | | | | Run `black` on user directory code (#4635)Amber Brown2019-02-132-131/+116
|/ / / / /
* | | | | Update changelog and versionErik Johnston2019-02-121-1/+1
* | | | | 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
* | | | | Merge pull request #4627 from matrix-org/erikj/user_ips_analyzeErik Johnston2019-02-122-3/+31
|\ \ \ \ \
| * | | | | Fix pep8Erik Johnston2019-02-121-1/+1
| * | | | | Analyze user_ips before running deduplicationErik Johnston2019-02-122-3/+31
* | | | | | Merge pull request #4626 from matrix-org/erikj/fixup_user_ips_dedupeErik Johnston2019-02-121-3/+60
|\ \ \ \ \ \
| * | | | | | Reduce user_ips bloat during dedupe background updateErik Johnston2019-02-121-3/+60
| |/ / / / /
* | | | | | Merge pull request #4625 from matrix-org/rav/fix_generate_config_warningsErik Johnston2019-02-121-7/+2
|\ \ \ \ \ \
| * | | | | | fix self-signed cert notice from generate-configRichard van der Hoff2019-02-121-7/+2
| |/ / / / /
* | | | | | Disable TLS by default (#4614)Richard van der Hoff2019-02-122-27/+27
* | | | | | Fix error when loading cert if tls is disabled (#4618)Richard van der Hoff2019-02-122-17/+45
|/ / / / /
* | | | | fix testsRichard van der Hoff2019-02-111-1/+1
* | | | | Infer no_tls from presence of TLS listenersRichard van der Hoff2019-02-115-18/+24
* | | | | Merge branch 'rav/no_create_server_contexts_if_no_tls' into rav/tls_cert/workRichard van der Hoff2019-02-112-3/+6
|\ \ \ \ \
| * | | | | Don't create server contexts when TLS is disabledRichard van der Hoff2019-02-112-3/+6
* | | | | | Merge branch 'rav/tls_config_logging_fixes' into rav/tls_cert/workRichard van der Hoff2019-02-112-22/+38
|\| | | | |
| * | | | | Logging improvements around TLS certsRichard van der Hoff2019-02-112-22/+38
* | | | | | Fail cleanly if listener config lacks a 'port'Richard van der Hoff2019-02-111-0/+5
|/ / / / /
* | | | | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611)Richard van der Hoff2019-02-113-6/+7
* | | | | Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updatingErik Johnston2019-02-113-5/+124
|\ \ \ \ \
| * | | | | make sure version is in body and wrap in linearizer queueHubert Chathi2019-02-082-12/+28
| * | | | | 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-063-1/+87
| * | | | | return proper error codes for some 404sHubert Chathi2019-02-061-4/+16
* | | | | | Clean up default listener configuration (#4586)Richard van der Hoff2019-02-111-48/+81
| |/ / / / |/| | | |
* | | | | ACME Reprovisioning (#4522)Amber Brown2019-02-114-25/+88
* | | | | Be tolerant of blank TLS fingerprints config (#4589)Amber Brown2019-02-111-1/+5
* | | | | Merge pull request #4420 from matrix-org/jaywink/openid-listenerErik Johnston2019-02-115-45/+130
|\ \ \ \ \
| * | | | | Fix flake8 issuesJason Robinson2019-01-232-2/+5
| * | | | | Remove openid resource from default configJason Robinson2019-01-231-4/+13
| * | | | | Document `servlet_groups` parametersJason Robinson2019-01-231-0/+23
| * | | | | Split federation OpenID userinfo endpoint out of the federation resourceJason Robinson2019-01-234-46/+93
| * | | | | Make SynapseHomeServer _http_listener use self.get_reactor()Jason Robinson2019-01-231-1/+3
| * | | | | Make FederationReaderServer _http_listen use self.get_reactor()Jason Robinson2019-01-231-1/+2
| * | | | | Add parameterized Python module to test dependenciesJason Robinson2019-01-231-1/+1
* | | | | | Allow "unavailable" presence status for /sync (#4592)Valentin Anger2019-02-082-1/+2
* | | | | | Fix 'no unique or exclusion constraint' error (#4591)Richard van der Hoff2019-02-081-6/+21
* | | | | | Deduplicate some code in synapse.app (#4567)Amber Brown2019-02-0813-158/+82
* | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-052-4/+4
|\ \ \ \ \ \
| * | | | | | v0.99.0 v0.99.0Richard van der Hoff2019-02-051-1/+1
| * | | | | | Fix default ACME config for py2 (#4564)Richard van der Hoff2019-02-051-1/+1
| * | | | | | fix typo in config comments (#4557)Richard van der Hoff2019-02-051-2/+2
| * | | | | | 0.99.0rc4 v0.99.0rc4Richard van der Hoff2019-02-011-1/+1
* | | | | | | Filter user directory state query to a subset of state events (#4462)Andrew Morgan2019-02-051-4/+12
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #4546 from matrix-org/rav/silence_critical_error_from_fede...Richard van der Hoff2019-02-011-2/+15
|\ \ \ \ \ \
| * | | | | | Fix noisy "twisted.internet.task.TaskStopped" errors in logsRichard van der Hoff2019-02-011-2/+15
* | | | | | | Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-02-011-20/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4544 from matrix-org/rav/skip_invalid_well_knownRichard van der Hoff2019-02-011-19/+6
| |\ \ \ \ \ \
| | * | | | | | Treat an invalid .well-known the same as an absent oneRichard van der Hoff2019-02-011-19/+6
| * | | | | | | Fix b'ab' noise in logsRichard van der Hoff2019-02-011-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'release-v0.99.0' into developRichard van der Hoff2019-02-011-22/+63
|\| | | | | |
| * | | | | | Cache failures to parse .well-knownRichard van der Hoff2019-02-011-13/+43
| * | | | | | better logging for federation connectionsRichard van der Hoff2019-01-311-5/+16
| * | | | | | Update federation routing logic to check .well-known before SRVRichard van der Hoff2019-01-311-5/+5
| |/ / / / /
* | | | | | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatableAndrew Morgan2019-01-312-11/+37
|\ \ \ \ \ \
| * | | | | | Raise an exception instead of returning NoneAndrew Morgan2019-01-311-2/+9
| * | | | | | New function for getting room's create eventAndrew Morgan2019-01-312-18/+21
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad...Andrew Morgan2019-01-315-3/+34
| |\ \ \ \ \ \
| * | | | | | | lintAndrew Morgan2019-01-311-2/+4
| * | | | | | | Copy over non-federatable trait on room upgradeAndrew Morgan2019-01-301-0/+14
* | | | | | | | Merge branch 'release-v0.99.0' into developRichard van der Hoff2019-01-313-8/+44
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | v0.99.0rc3 v0.99.0rc3Richard van der Hoff2019-01-311-1/+1
| * | | | | | Add some debug for membership syncing issues (#4538)Richard van der Hoff2019-01-311-2/+11
| * | | | | | Fix infinite loop when an event is redacted in a v3 room (#4535)Richard van der Hoff2019-01-311-5/+32
* | | | | | | Reject large transactions on federation (#4513)Andrew Morgan2019-01-311-0/+16
* | | | | | | Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-01-302-2/+2
|\| | | | | |
| * | | | | | v0.99.0rc2 v0.99.0rc2Richard van der Hoff2019-01-301-1/+1
| * | | | | | Merge remote-tracking branch 'origin/develop' into release-v0.99.0Richard van der Hoff2019-01-301-1/+13
| |\ \ \ \ \ \
| * | | | | | | Update constants.pyNeil Johnson2019-01-301-1/+1
| * | | | | | | 0.99.0rc1 v0.99.0rc1Richard van der Hoff2019-01-301-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | by default include m.room.encryption on invites (#3902)Matthew Hodgson2019-01-302-0/+3
| |/ / / / / |/| | | | |
* | | | | | Fix remote invite rejections not comming down syncErik Johnston2019-01-301-1/+13
|/ / / / /
* | | | | Merge pull request #4472 from matrix-org/neilj/room_capabilitiesErik Johnston2019-01-303-0/+74
|\ \ \ \ \
| * \ \ \ \ Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ...Neil Johnson2019-01-3053-542/+1641
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into neilj/room_capabilitiesNeil Johnson2019-01-3053-542/+1641
| | |\ \ \ \ \
| * | | | | | | isortNeil Johnson2019-01-301-2/+1
| |/ / / / / /
| * | | | | | define room dispositions for use in exposing room capabilitiesNeil Johnson2019-01-301-0/+5
| * | | | | | formatting and use constants where availableNeil Johnson2019-01-301-19/+17
| * | | | | | Populate default room version from ConstantsNeil Johnson2019-01-301-1/+2
| * | | | | | reflect that rooms v3 is a stable room versionNeil Johnson2019-01-302-0/+2
| * | | | | | rework format of change password capabilityNeil Johnson2019-01-291-1/+3
| * | | | | | support change_password in capabilities end-pointNeil Johnson2019-01-291-2/+12
| * | | | | | enforce auth for capabilities endpointNeil Johnson2019-01-291-10/+17
| * | | | | | register capabilities servletNeil Johnson2019-01-291-0/+2
| * | | | | | backout v3Neil Johnson2019-01-252-2/+0
| * | | | | | Support room version capabilities in CS API (MSC1804)Neil Johnson2019-01-251-0/+49
| * | | | | | track unstable room v3Neil Johnson2019-01-251-0/+2
* | | | | | | Fix replication for room v3 (#4523)Erik Johnston2019-01-301-1/+4
* | | | | | | ACME config cleanups (#4525)Richard van der Hoff2019-01-304-60/+114
* | | | | | | Raise ConfigError insteadErik Johnston2019-01-301-1/+3
* | | | | | | _listener_http should return a listErik Johnston2019-01-301-1/+1
* | | | | | | Merge pull request #4521 from matrix-org/rav/fed_routing/cleanupsRichard van der Hoff2019-01-301-9/+11
|\ \ \ \ \ \ \
| * | | | | | | fix exception textRichard van der Hoff2019-01-301-1/+1
| * | | | | | | Also jitter the invalid cache periodRichard van der Hoff2019-01-301-9/+11
* | | | | | | | Follow redirects on .well-known (#4520)Richard van der Hoff2019-01-301-2/+4
* | | | | | | | SIGHUP for TLS cert reloading (#4495)Amber Brown2019-01-303-20/+79
|/ / / / / / /
* | | | | | | Add a caching layer to .well-known responses (#4516)Richard van der Hoff2019-01-302-2/+249
* | | | | | | Fix flake8 (#4519)Amber Brown2019-01-307-92/+92
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #4486 from xperimental/workaround-4216Richard van der Hoff2019-01-301-1/+4
|\ \ \ \ \ \
| * | | | | | Implement workaround for login error.Robert Jacob2019-01-301-1/+4
* | | | | | | No vdh tests!Erik Johnston2019-01-291-2/+1
* | | | | | | Enable room version v3Erik Johnston2019-01-294-4/+14
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-298-46/+76
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #4514 from matrix-org/erikj/remove_event_idErik Johnston2019-01-298-47/+82
| |\ \ \ \ \ \ \
| | * | | | | | | Update commentErik Johnston2019-01-291-3/+3
| | * | | | | | | check event format version not room versionErik Johnston2019-01-291-2/+2
| | * | | | | | | Don't assert an event must have an event IDErik Johnston2019-01-291-2/+3
| | * | | | | | | Only check event ID domain for signatures for V1 eventsErik Johnston2019-01-293-31/+44
| | * | | | | | | Use event origin for filtering incoming eventsErik Johnston2019-01-291-4/+7
| | * | | | | | | Use snder and not event ID domain to check if oursErik Johnston2019-01-292-1/+9
| | * | | | | | | Remove event ID usage when checking if new roomErik Johnston2019-01-291-1/+2
| | * | | | | | | Only check event IDs domain signed event for V1 and V2Erik Johnston2019-01-291-5/+14
* | | | | | | | | Fixup commentErik Johnston2019-01-291-2/+2
* | | | | | | | | kill vdh test some moreErik Johnston2019-01-291-2/+1
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-2917-208/+503
|\| | | | | | | |
| * | | | | | | | Merge pull request #4483 from matrix-org/erikj/event_v2Erik Johnston2019-01-294-19/+108
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Implement event format v2Erik Johnston2019-01-294-19/+108
| * | | | | | | | | Merge pull request #4512 from matrix-org/anoa/consent_dirAndrew Morgan2019-01-292-11/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Check consent dir path on startupAndrew Morgan2019-01-292-11/+14
| * | | | | | | | | Relax requirement for a content-type on .well-known (#4511)Richard van der Hoff2019-01-291-20/+13
| * | | | | | | | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurlTravis Ralston2019-01-291-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Don't recommend :8448 to people on public_baseurlTravis Ralston2019-01-281-1/+1
| * | | | | | | | | Do not generate self-signed TLS certificates by default. (#4509)Amber Brown2019-01-291-43/+18
| | |/ / / / / / / | |/| | | | | | |