summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4701 from fistons/fix-migration-scriptErik Johnston2019-02-212-0/+4
|\
| * Consider e2e_room_keys.is_verified column as booleanEric2019-02-202-0/+4
|/
* Merge pull request #4694 from matrix-org/erikj/fix_sentry_config_formatErik Johnston2019-02-202-0/+3
|\
| * NewsfileErik Johnston2019-02-201-0/+1
| * Fixup generated metrics configErik Johnston2019-02-201-0/+2
* | Add metrics for number of outgoing EDUs, by type (#4695)Richard van der Hoff2019-02-203-6/+19
* | UPSERT many functionality (#4644)Amber Brown2019-02-204-13/+224
* | Logging improvements for the pusher (#4691)Richard van der Hoff2019-02-203-13/+15
* | Fix TaskStopped exceptions when outbound requests time out (#4690)Richard van der Hoff2019-02-204-18/+30
* | Clean up gitignores (#4688)Richard van der Hoff2019-02-203-58/+38
* | Merge pull request #4678 from matrix-org/rav/tls_install_instructionsRichard van der Hoff2019-02-2026-216/+268
|\ \ | |/ |/|
| * changelogRichard van der Hoff2019-02-191-0/+1
| * Attempt to make default config more consistentRichard van der Hoff2019-02-1924-196/+248
| * clarify TLS instructionsRichard van der Hoff2019-02-191-20/+19
* | Fix registration on workers (#4682)Erik Johnston2019-02-2014-151/+277
* | Run unit tests against python 3.7 (#4677)Richard van der Hoff2019-02-203-38/+14
* | Merge pull request #4671 from matrix-org/erikj/state_cache_invalidationErik Johnston2019-02-195-33/+96
|\ \ | |/ |/|
| * DocsErik Johnston2019-02-192-2/+8
| * Use itertoolsErik Johnston2019-02-191-2/+2
| * DocumentationErik Johnston2019-02-192-5/+24
| * NewsfileErik Johnston2019-02-181-0/+1
| * Batch cache invalidation over replicationErik Johnston2019-02-183-32/+69
* | Merge pull request #4676 from matrix-org/rav/pg95Richard van der Hoff2019-02-192-14/+33
|\ \
| * | Test against Postgres 9.5 as well as 9.4Richard van der Hoff2019-02-192-14/+33
| |/
* | Merge pull request #4652 from matrix-org/babolivier/acme-delegatedBrendan Abolivier2019-02-193-4/+21
|\ \
| * | 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-1814-41/+297
| |\ \
| * | | Typo in changelogAndrew Morgan2019-02-181-1/+1
| * | | 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-152-4/+24
* | | | Merge pull request #4670 from matrix-org/erikj/register_login_splitErik Johnston2019-02-195-43/+47
|\ \ \ \
| * | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | Update worker docsErik Johnston2019-02-182-2/+3
| * | | | Split /login into client_readerErik Johnston2019-02-182-41/+43
* | | | | Try and make TLS federation client code faster (#4674)Richard van der Hoff2019-02-192-8/+7
|\ \ \ \ \
| * | | | | misc->featureRichard van der Hoff2019-02-191-0/+0
| * | | | | changelogAmber Brown2019-02-191-0/+1
| * | | | | 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-192-0/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | lintAndrew Morgan2019-02-181-1/+3
| * | | | Move member event processing and changelog fixAndrew Morgan2019-02-182-9/+7
| * | | | Membership events are done laterAndrew Morgan2019-02-181-12/+20
| * | | | Add changelogAndrew Morgan2019-02-181-0/+1
| * | | | Transfer bans on room upgradeAndrew Morgan2019-02-181-0/+14
* | | | | Merge pull request #4632 from matrix-org/erikj/basic_sentryErik Johnston2019-02-184-1/+61
|\ \ \ \ \
| * | | | | Fixup error handling and messageErik Johnston2019-02-181-5/+6
| * | | | | FixupErik Johnston2019-02-181-1/+1
| * | | | | Fixup comments and add warningErik Johnston2019-02-133-6/+11
| * | | | | NewsfileErik Johnston2019-02-121-0/+1
| * | | | | 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-1811-255/+450
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Move register_device into handlerErik Johnston2019-02-185-172/+97
| * | | | | Update docsErik Johnston2019-02-182-1/+7
| * | | | | Update changelog.d/4666.featureWill Hunt2019-02-181-1/+1
| * | | | | Fix unit testsErik Johnston2019-02-181-6/+15
| * | | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | | Split out registration to workerErik Johnston2019-02-187-147/+401
* | | | | | Merge pull request #4668 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-182-5/+10
|\ \ \ \ \ \
| * | | | | | pep8Erik Johnston2019-02-181-1/+5
| * | | | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | | | Correctly handle HttpResponseExceptionErik Johnston2019-02-181-4/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4669 from matrix-org/erikj/log_exceptionErik Johnston2019-02-182-3/+4
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | | | Cleanup top level request exception loggingErik Johnston2019-02-181-3/+3
| |/ / / / /
* | | | | | Merge pull request #4651 from matrix-org/matthew/well-known-corsErik Johnston2019-02-182-0/+4
|\ \ \ \ \ \
| * | | | | | FixupErik Johnston2019-02-182-1/+2
| * | | | | | changelogMatthew Hodgson2019-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-183-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | NewsfileErik Johnston2019-02-181-0/+1
| * | | | | Fix kicking guest users in worker modeErik Johnston2019-02-182-1/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #4643 from matrix-org/erikj/catch_exceptionsErik Johnston2019-02-185-8/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | NewsfileErik Johnston2019-02-141-0/+1
| * | | | Correctly handle RequestSendFailed exceptionsErik Johnston2019-02-144-8/+19
| | |_|/ | |/| |
* | | | Merge pull request #4657 from matrix-org/travis/linda/spellingErik Johnston2019-02-183-2/+3
|\ \ \ \
| * | | | UPGRADE.rst: Fix a typo in "Upgrading Synapse" sectionJuuso "Linda" Lapinlampi2019-02-151-1/+1
| * | | | config: Remove a repeated word from a logger warningJuuso "Linda" Lapinlampi2019-02-151-1/+1
| * | | | ChangelogTravis Ralston2019-02-151-0/+1
|/ / / /
* | | | Merge pull request #4647 from matrix-org/erikj/add_room_publishing_rulesErik Johnston2019-02-156-31/+274
|\ \ \ \ | |_|/ / |/| | |
| * | | 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-142-6/+24
| * | | Only fetch aliases when publishing roomsErik Johnston2019-02-141-15/+15
| * | | Fixup commentsErik Johnston2019-02-141-8/+15
| * | | NewsfileErik Johnston2019-02-141-0/+1
| * | | Add configurable room list publishing rulesErik Johnston2019-02-145-22/+200
| |/ /
* | | Merge branch 'master' into developRichard van der Hoff2019-02-146-8/+37
|\ \ \
| * \ \ Merge branch 'release-v0.99.1'Richard van der Hoff2019-02-146-8/+37
| |\ \ \
| | * | | Fix debian build dockerfile github/release-v0.99.1 release-v0.99.1Richard van der Hoff2019-02-141-1/+5
| | * | | 0.99.1.1 v0.99.1.1Richard van der Hoff2019-02-144-3/+17
| | * | | Fix errors in acme provisioning (#4648)Richard van der Hoff2019-02-143-6/+17
* | | | | Merge branch 'master' into developRichard van der Hoff2019-02-146-7/+17
|\| | | | | |_|/ / |/| | |
| * | | Merge tag 'v0.99.1'Richard van der Hoff2019-02-1456-555/+1312
| |\| |
| | * | 0.99.1 v0.99.1Richard van der Hoff2019-02-143-16/+11
| | * | implement `reload` by sending the HUP signal (#4622)Дамјан Георгиевски2019-02-142-0/+7
| | * | 0.99.1rc2 v0.99.1rc2Richard van der Hoff2019-02-133-2/+10
| * | | Update MSC1711_certificates_FAQ.mdErik Johnston2019-02-081-1/+1
* | | | Merge pull request #4450 from 14mRh4X0r/fix-dependency-messageRichard van der Hoff2019-02-132-2/+7
|\ \ \ \
| * | | | Fix error message for optional dependenciesWillem Mulder2019-01-232-2/+7
* | | | | Merge remote-tracking branch 'origin/release-v0.99.1' into developRichard van der Hoff2019-02-134-22/+35
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #4636 from matrix-org/rav/bind_address_fixesRichard van der Hoff2019-02-134-22/+35
| |\ \ \ \
| | * | | | Update synapse/app/_base.pyErik Johnston2019-02-131-1/+1
| | * | | | changelogRichard van der Hoff2019-02-131-0/+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-133-131/+117
|/ / / /
* | | | Fixup changelog v0.99.1rc1Erik Johnston2019-02-121-4/+4
* | | | Update changelog and versionErik Johnston2019-02-1232-32/+47
* | | | Merge pull request #4608 from matrix-org/anoa/acls_room_upgradeErik Johnston2019-02-122-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | ChangelogAndrew Morgan2019-02-111-0/+1
| * | | Transfer Server ACLs on room upgradeAndrew Morgan2019-02-111-0/+1
* | | | Fixup changelog entriesErik Johnston2019-02-124-2/+2
* | | | Merge pull request #4627 from matrix-org/erikj/user_ips_analyzeErik Johnston2019-02-123-3/+32
|\ \ \ \
| * | | | Fix pep8Erik Johnston2019-02-121-1/+1
| * | | | NewsfileErik Johnston2019-02-121-0/+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-122-3/+61
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-02-121-0/+1
| * | | | | 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-122-7/+3
|\ \ \ \ \
| * | | | | fix self-signed cert notice from generate-configRichard van der Hoff2019-02-122-7/+3
| |/ / / /
* | | | | README updates (#4621)Richard van der Hoff2019-02-123-63/+80
* | | | | Disable TLS by default (#4614)Richard van der Hoff2019-02-123-27/+28
* | | | | Fix error when loading cert if tls is disabled (#4618)Richard van der Hoff2019-02-124-18/+47
|/ / / /
* | | | Merge pull request #4619 from matrix-org/rav/remove_docker_no_tls_hacksErik Johnston2019-02-123-24/+2
|\ \ \ \
| * | | | Remove redundant entries from docker configRichard van der Hoff2019-02-113-24/+2
* | | | | Merge pull request #4613 from matrix-org/rav/deprecate_no_tlsErik Johnston2019-02-1211-44/+82
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix testsRichard van der Hoff2019-02-112-3/+7
| * | | | Infer no_tls from presence of TLS listenersRichard van der Hoff2019-02-1110-20/+27
| * | | | Merge branch 'rav/no_create_server_contexts_if_no_tls' into rav/tls_cert/workRichard van der Hoff2019-02-113-3/+7
| |\ \ \ \
| | * | | | Don't create server contexts when TLS is disabledRichard van der Hoff2019-02-113-3/+7
| * | | | | Merge branch 'rav/tls_config_logging_fixes' into rav/tls_cert/workRichard van der Hoff2019-02-113-22/+39
| |\| | | |
| | * | | | Logging improvements around TLS certsRichard van der Hoff2019-02-113-22/+39
| |/ / / / |/| | | |
| * | | | Fail cleanly if listener config lacks a 'port'Richard van der Hoff2019-02-112-0/+6
|/ / / /
* | | | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611)Richard van der Hoff2019-02-115-9/+9
* | | | Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updatingErik Johnston2019-02-115-5/+197
|\ \ \ \
| * | | | make sure version is in body and wrap in linearizer queueHubert Chathi2019-02-083-12/+100
| * | | | re-try to make isort happyHubert Chathi2019-02-061-1/+1
| * | | | add changelog entryHubert Chathi2019-02-061-0/+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-112-48/+82
* | | | | Clarifications for reverse proxy docs (#4607)Richard van der Hoff2019-02-116-62/+117
| |/ / / |/| | |
* | | | ACME Reprovisioning (#4522)Amber Brown2019-02-115-25/+89
* | | | Be tolerant of blank TLS fingerprints config (#4589)Amber Brown2019-02-112-1/+6
* | | | Merge pull request #4420 from matrix-org/jaywink/openid-listenerErik Johnston2019-02-119-46/+252
|\ \ \ \
| * | | | Fix flake8 issuesJason Robinson2019-01-233-4/+13
| * | | | Fix openid tests after rebaseJason Robinson2019-01-231-2/+2
| * | | | Fix sorting of imports in tests. Remove an unnecessary mockJason Robinson2019-01-231-2/+2
| * | | | Collapse changelog to one lineJason Robinson2019-01-231-13/+1
| * | | | Remove openid resource from default configJason Robinson2019-01-231-4/+13
| * | | | Document `servlet_groups` parametersJason Robinson2019-01-231-0/+23
| * | | | Add changelog for openid resource additionJason Robinson2019-01-231-0/+13
| * | | | Split federation OpenID userinfo endpoint out of the federation resourceJason Robinson2019-01-234-46/+93
| * | | | Add tests for the openid lister for SynapseHomeServerJason Robinson2019-01-231-1/+48
| * | | | Make SynapseHomeServer _http_listener use self.get_reactor()Jason Robinson2019-01-231-1/+3
| * | | | Add tests for the openid lister for FederationReaderServerJason Robinson2019-01-231-0/+66
| * | | | Make FederationReaderServer _http_listen use self.get_reactor()Jason Robinson2019-01-231-1/+2
| * | | | Add parameterized Python module to test dependenciesJason Robinson2019-01-232-1/+2
| * | | | Fix a test docstring in frontend proxy testsJason Robinson2019-01-231-1/+1
* | | | | Allow "unavailable" presence status for /sync (#4592)Valentin Anger2019-02-083-1/+4
* | | | | Fix 'no unique or exclusion constraint' error (#4591)Richard van der Hoff2019-02-082-6/+22
* | | | | Deduplicate some code in synapse.app (#4567)Amber Brown2019-02-0814-158/+83
* | | | | Merge branch 'master' into developRichard van der Hoff2019-02-070-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | cleanupsRichard van der Hoff2019-02-071-4/+2
| * | | | Merge branch 'master' into erikj/msc1711_faqRichard van der Hoff2019-02-073-12/+17
| |\ \ \ \
| * | | | | NewsfileErik Johnston2019-02-071-0/+1
| * | | | | Update MSC1711 FAQ to be explicit about well-knownErik Johnston2019-02-071-11/+27
* | | | | | Update MSC1711 FAQ to be explicit about well-known (#4584)Erik Johnston2019-02-072-13/+28
* | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-073-12/+17
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/release-v0.99.0'Richard van der Hoff2019-02-072-11/+16
| |\ \ \ \ \
| | * | | | | Update ACME docs to include port instructions (#4578) github/release-v0.99.0 release-v0.99.0Andrew Morgan2019-02-072-11/+16
| * | | | | | clarify option 1Richard van der Hoff2019-02-071-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-062-0/+3
|\| | | | |
| * | | | | Fix docker upload job to push -py2 images (#4576)Richard van der Hoff2019-02-062-0/+3
* | | | | | Merge branch 'master' into developRichard van der Hoff2019-02-052-37/+19
|\| | | | |
| * | | | | faq cleanupsRichard van der Hoff2019-02-052-37/+19
| |/ / / /
* | | | | Merge branch 'master' into developRichard van der Hoff2019-02-0518-579/+1051
|\| | | |
| * | | | v0.99.0 v0.99.0Richard van der Hoff2019-02-0510-63/+23
| * | | | Add notes on SRV and .well-known (#4573)Richard van der Hoff2019-02-051-41/+117
| * | | | fix some thinkos in UPGRADE.rstRichard van der Hoff2019-02-051-6/+7
| * | | | Merge pull request #4570 from matrix-org/anoa/self_signed_upgradeAndrew Morgan2019-02-054-120/+151
| |\ \ \ \
| | * | | | Add TL;DR and final step details to ACMEAndrew Morgan2019-02-051-4/+20
| | * | | | Merge branch 'anoa/self_signed_upgrade' of github.com:matrix-org/synapse into...Andrew Morgan2019-02-051-1/+1
| | |\ \ \ \
| | | * | | | Update docs/ACME.mdRichard van der Hoff2019-02-051-2/+2
| | * | | | | Update ACMEAndrew Morgan2019-02-051-14/+17
| | * | | | | Update INSTALLAndrew Morgan2019-02-051-4/+4
| | * | | | | Update READMEAndrew Morgan2019-02-051-8/+1
| | |/ / / /
| | * | | | Actually add ACME docsAndrew Morgan2019-02-051-0/+107
| | * | | | Move ACME docs from INSTALL.md to ACME.mdAndrew Morgan2019-02-051-78/+1
| | * | | | Re-add link to ACME docs from READMEAndrew Morgan2019-02-051-0/+6
| | * | | | Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into anoa/sel...Andrew Morgan2019-02-0514-421/+621
| | |\ \ \ \
| | * | | | | Convert ACME docs to mdAndrew Morgan2019-02-053-100/+2
| | * | | | | Add link to ACME docs from READMEAndrew Morgan2019-02-051-0/+6
| | * | | | | Move ACME docs to docs/ACME.rst and link from UPGRADE.Andrew Morgan2019-02-053-98/+102
| | * | | | | Don't imply self-signed certs are requiredAndrew Morgan2019-02-051-16/+17
| * | | | | | Neilj/1711faq (#4572)Neil Johnson2019-02-053-0/+263
| | |/ / / / | |/| | | |
| * | | | | Move things from README.rst to UPDATE.md (#4569)Richard van der Hoff2019-02-052-442/+490
| * | | | | Enable ACME support in the docker image (#4566)Richard van der Hoff2019-02-056-41/+116
| * | | | | Docker: only copy what we need to the build image (#4562)Richard van der Hoff2019-02-052-1/+5
| * | | | | Fix default ACME config for py2 (#4564)Richard van der Hoff2019-02-052-1/+2
| * | | | | switch docker image to py3 by default (#4558)Richard van der Hoff2019-02-052-4/+5
| * | | | | fix typo in config comments (#4557)Richard van der Hoff2019-02-052-2/+3
| |/ / / /
| * | | | Merge pull request #4547 from matrix-org/anoa/acme_docsAndrew Morgan2019-02-012-83/+86
| |\ \ \ \
| | * | | | Fix nginx capatilizationAndrew Morgan2019-02-011-2/+2
| | * | | | Address commentsAndrew Morgan2019-02-011-17/+13
| | * | | | Update README.rstRichard van der Hoff2019-02-011-1/+1
| | * | | | Update README.rstRichard van der Hoff2019-02-011-1/+1
| | * | | | Actually need to enable itAndrew Morgan2019-02-011-0/+8
| | * | | | Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into anoa/acm...Andrew Morgan2019-02-015-4/+12
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 0.99.0rc4 v0.99.0rc4Richard van der Hoff2019-02-015-4/+12
| | * | | | Address changesAndrew Morgan2019-02-011-22/+13
| | * | | | Remove error and add link to foks fed tester projectAndrew Morgan2019-02-011-2/+3
| | * | | | Clean up portions of docs that talk about reversing fed portAndrew Morgan2019-02-011-97/+24
| | * | | | Add changelogAndrew Morgan2019-02-011-0/+1
| | * | | | Add docs for ACME setupAndrew Morgan2019-02-011-0/+79
| |/ / / /
* | | / / Filter user directory state query to a subset of state events (#4462)Andrew Morgan2019-02-052-4/+13
| |_|/ / |/| | |
* | | | Merge pull request #4546 from matrix-org/rav/silence_critical_error_from_fede...Richard van der Hoff2019-02-012-2/+16
|\ \ \ \
| * | | | Fix noisy "twisted.internet.task.TaskStopped" errors in logsRichard van der Hoff2019-02-012-2/+16
* | | | | Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-02-013-31/+78
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4544 from matrix-org/rav/skip_invalid_well_knownRichard van der Hoff2019-02-013-30/+77
| |\ \ \ \
| | * | | | Treat an invalid .well-known the same as an absent oneRichard van der Hoff2019-02-013-30/+77
| * | | | | 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-014-52/+86
|\| | | |
| * | | | Merge pull request #4542 from matrix-org/rav/cache_for_bad_well_knownRichard van der Hoff2019-02-012-17/+59
| |\ \ \ \
| | * | | | changelogRichard van der Hoff2019-02-011-0/+1
| | * | | | 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
| * | | | | Merge pull request #4539 from matrix-org/rav/update_wellknown_routingRichard van der Hoff2019-02-013-35/+27
| |\| | | | | | |/ / / | |/| | |
| | * | | Update federation routing logic to check .well-known before SRVRichard van der Hoff2019-01-313-35/+27
| |/ / /
* | | | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatableAndrew Morgan2019-01-313-11/+38
|\ \ \ \
| * | | | 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-3190-84/+151
| |\ \ \ \
| * | | | | lintAndrew Morgan2019-01-311-2/+4
| * | | | | Add changelogAndrew Morgan2019-01-301-0/+1
| * | | | | 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-316-13/+103
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-27 21:50:42 +0000