summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Remove unused importBrendan Abolivier2019-02-151-1/+0
* Support .well-known delegation when issuing certificates through ACMEBrendan Abolivier2019-02-152-4/+24
* 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
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | v0.99.0rc3 v0.99.0rc3Richard van der Hoff2019-01-315-4/+22
| * | | | Add some debug for membership syncing issues (#4538)Richard van der Hoff2019-01-312-2/+12
| * | | | Fix infinite loop when an event is redacted in a v3 room (#4535)Richard van der Hoff2019-01-312-5/+33
| * | | | update debian installation instructions (#4526)Richard van der Hoff2019-01-312-5/+32
| * | | | cleanups for contrib/prometheus/READMERichard van der Hoff2019-01-301-0/+7
* | | | | Reject large transactions on federation (#4513)Andrew Morgan2019-01-312-0/+17
* | | | | Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-01-3086-84/+117
|\| | | |
| * | | | v0.99.0rc2 v0.99.0rc2Richard van der Hoff2019-01-304-3/+18
| * | | | Merge remote-tracking branch 'origin/develop' into release-v0.99.0Richard van der Hoff2019-01-302-1/+14
| |\ \ \ \
| * | | | | ACME Upgrade Docs (#4528)Amber Brown2019-01-302-0/+33
| * | | | | Update constants.pyNeil Johnson2019-01-301-1/+1
| * | | | | 0.99.0rc1 v0.99.0rc1Richard van der Hoff2019-01-3083-82/+67
| | |/ / / | |/| | |
* | | | | by default include m.room.encryption on invites (#3902)Matthew Hodgson2019-01-303-0/+4
| |/ / / |/| | |
* | | | Merge pull request #4527 from matrix-org/erikj/fix_sending_remote_invite_reje...Erik Johnston2019-01-302-1/+14
|\ \ \ \ | |/ / / |/| | |
| * | | NewsfileErik Johnston2019-01-301-0/+1
| * | | 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-305-0/+153
|\ \ \
| * \ \ Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ...Neil Johnson2019-01-30123-669/+2451
| |\ \ \
| | * \ \ Merge branch 'develop' into neilj/room_capabilitiesNeil Johnson2019-01-30123-669/+2451
| | |\ \ \
| * | | | | 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-292-3/+5
| * | | | update to reflect broadening scopeNeil Johnson2019-01-291-1/+1
| * | | | support change_password in capabilities end-pointNeil Johnson2019-01-292-2/+35
| * | | | isortNeil Johnson2019-01-291-1/+2
| * | | | enforce auth for capabilities endpointNeil Johnson2019-01-292-14/+36
| * | | | 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-252-0/+88
| * | | | towncrierNeil Johnson2019-01-251-0/+1
| * | | | track unstable room v3Neil Johnson2019-01-251-0/+2
* | | | | Fix replication for room v3 (#4523)Erik Johnston2019-01-302-1/+5
* | | | | ACME config cleanups (#4525)Richard van der Hoff2019-01-305-60/+115
* | | | | Merge pull request #4524 from matrix-org/erikj/fix_no_tlsErik Johnston2019-01-302-1/+4
|\ \ \ \ \
| * | | | | Raise ConfigError insteadErik Johnston2019-01-301-1/+3
| * | | | | NewsfileErik Johnston2019-01-301-0/+1
| * | | | | _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-302-9/+12
|\ \ \ \ \
| * | | | | newsfileRichard van der Hoff2019-01-301-0/+1
| * | | | | 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-303-2/+102
* | | | | | SIGHUP for TLS cert reloading (#4495)Amber Brown2019-01-305-20/+81
|/ / / / /
* | | | | Add a caching layer to .well-known responses (#4516)Richard van der Hoff2019-01-306-10/+493
* | | | | Fix flake8 (#4519)Amber Brown2019-01-3012-102/+94
| |/ / / |/| | |
* | | | Merge pull request #4486 from xperimental/workaround-4216Richard van der Hoff2019-01-302-1/+5
|\ \ \ \
| * | | | Implement workaround for login error.Robert Jacob2019-01-302-1/+5
* | | | | Merge pull request #4515 from matrix-org/erikj/room_version_v3Erik Johnston2019-01-295-4/+14
|\ \ \ \ \
| * | | | | No vdh tests!Erik Johnston2019-01-291-2/+1
| * | | | | NewsfileErik Johnston2019-01-291-0/+1
| * | | | | Enable room version v3Erik Johnston2019-01-294-4/+14
|/ / / / /
* | | | | Merge pull request #4499 from matrix-org/erikj/redactions_eiahErik Johnston2019-01-298-16/+77
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-299-46/+77
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #4514 from matrix-org/erikj/remove_event_idErik Johnston2019-01-299-47/+83
|\ \ \ \ \ \
| * | | | | | Update commentErik Johnston2019-01-291-3/+3
| * | | | | | check event format version not room versionErik Johnston2019-01-291-2/+2
| * | | | | | NewsfileErik Johnston2019-01-291-0/+1
| * | | | | | 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-2954-288/+1051
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #4483 from matrix-org/erikj/event_v2Erik Johnston2019-01-295-19/+109
|\ \ \ \ \ \ \
| * | | | | | | NewsfileErik Johnston2019-01-291-0/+1
| * | | | | | | Implement event format v2Erik Johnston2019-01-294-19/+108
* | | | | | | | Merge pull request #4512 from matrix-org/anoa/consent_dirAndrew Morgan2019-01-293-11/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add changelogAndrew Morgan2019-01-291-0/+1
| * | | | | | | 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-293-21/+14
* | | | | | | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurlTravis Ralston2019-01-292-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Create 4498.miscTravis Ralston2019-01-281-0/+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-294-45/+94
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-2910-164/+288
|\ \ \ \ \ \ \
| * | | | | | | Correctly set context.app_serviceErik Johnston2019-01-291-0/+2
| * | | | | | | Don't set event_id twiceErik Johnston2019-01-291-2/+0
| * | | | | | | Remove dead functionErik Johnston2019-01-291-11/+0
| * | | | | | | Fix test to use valid event formatErik Johnston2019-01-291-1/+1
| * | | | | | | Replace usage of builder.user_id with builder.senderErik Johnston2019-01-291-1/+1
| * | | | | | | NewsfileErik Johnston2019-01-291-0/+1
| * | | | | | | Refactor event building into EventBuilderErik Johnston2019-01-295-112/+254
| * | | | | | | Make add_hashes_and_signatures operate on dictsErik Johnston2019-01-292-40/+32
* | | | | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489)Richard van der Hoff2019-01-2923-21/+470
* | | | | | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signatureErik Johnston2019-01-293-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | NewsfileErik Johnston2019-01-291-0/+1
| * | | | | | | | Fixup calls to `comput_event_signature`Erik Johnston2019-01-292-2/+2
* | | | | | | | | Enable configuring test log level via env var (#4506)Richard van der Hoff2019-01-294-30/+80
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-27 01:48:12 +0000