summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Correctly handle HttpResponseExceptionErik Johnston2019-02-181-4/+4
* 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
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-297-133/+260
| |\ \ \ \ \ \
| | * | | | | | 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
| | * | | | | | Replace usage of builder.user_id with builder.senderErik Johnston2019-01-291-1/+1
| | * | | | | | Refactor event building into EventBuilderErik Johnston2019-01-295-112/+254
| | * | | | | | Make add_hashes_and_signatures operate on dictsErik Johnston2019-01-291-10/+6
| * | | | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489)Richard van der Hoff2019-01-291-4/+110
| * | | | | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signatureErik Johnston2019-01-292-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fixup calls to `comput_event_signature`Erik Johnston2019-01-292-2/+2
* | | | | | | | | Update synapse/storage/events_worker.pyErik Johnston2019-01-291-1/+1
* | | | | | | | | Check redaction state when event is pulled out of the databaseErik Johnston2019-01-291-0/+13
* | | | | | | | | Fix typoErik Johnston2019-01-291-1/+1
* | | | | | | | | Remove unused argErik Johnston2019-01-291-2/+1
* | | | | | | | | Drop vdh supportErik Johnston2019-01-294-6/+2
* | | | | | | | | Add docstringErik Johnston2019-01-291-0/+12
* | | | | | | | | Update synapse/storage/events_worker.pyRichard van der Hoff2019-01-291-1/+1
* | | | | | | | | Finish comment...Erik Johnston2019-01-291-1/+1
* | | | | | | | | Implement rechecking of redactionsErik Johnston2019-01-295-10/+53
* | | | | | | | | Add RoomVersions.V3 constant, without enabling itErik Johnston2019-01-291-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #4496 from matrix-org/erikj/invite_fallbackErik Johnston2019-01-292-14/+89
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Implement fallback for V2 invite APIErik Johnston2019-01-282-14/+89
* | | | | | | | Make linearizer more quiet (#4507)Amber Brown2019-01-291-5/+5
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validatorErik Johnston2019-01-293-26/+45
|\ \ \ \ \ \ \
| * | | | | | | Remove duplicate checksErik Johnston2019-01-291-14/+0
| * | | | | | | Fix up error messagesErik Johnston2019-01-291-2/+2
| * | | | | | | Fold validate into validate_newErik Johnston2019-01-291-16/+11
| * | | | | | | Split up event validation between event and builderErik Johnston2019-01-283-23/+61
* | | | | | | | Fix receiving events from federation via a workerErik Johnston2019-01-291-1/+1
* | | | | | | | Fix typo in upserts code (#4505)Amber Brown2019-01-291-1/+1
* | | | | | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signingErik Johnston2019-01-292-42/+104
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor event signing to work on dictsErik Johnston2019-01-282-42/+104
| |/ / / / / / /
* | | | | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-288-25/+56
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Correctly use default room version if none is setErik Johnston2019-01-281-2/+2
| * | | | | | | Pass through room version to event authErik Johnston2019-01-258-24/+55
| | |_|/ / / / | |/| | | | |
* | | | | | | Fix worker TLS (#4492)Amber Brown2019-01-287-48/+48
| |/ / / / / |/| | | | |
* | | | | | Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-283-12/+20
* | | | | | 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-2815-107/+342
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | docstrings for _RoutingResultRichard van der Hoff2019-01-281-0/+36
| * | | | | Handle IP literals explicitlyRichard van der Hoff2019-01-281-0/+19
| * | | | | MatrixFederationAgent: factor out routing logicRichard van der Hoff2019-01-281-18/+62
| * | | | | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)Richard van der Hoff2019-01-281-11/+12
| |/ / / /
| * | | | Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-2511-82/+205
| |\ \ \ \
| | * | | | Replace missed usages of FrozenEventErik Johnston2019-01-253-10/+14
| | * | | | Require event format version to parse or create eventsErik Johnston2019-01-258-72/+191
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_nat...Erik Johnston2019-01-257-6/+99
| |\ \ \ \ \
| | * | | | | Fix quoting for allowed_local_3pids example config (#4476)Richard van der Hoff2019-01-251-3/+3
| | * | | | | Fix Host header sent by MatrixFederationAgent (#4468)Richard van der Hoff2019-01-252-1/+10
| | * | | | | Don't require sqlite3 when using postgres (#4466)Andrew Morgan2019-01-251-2/+1
| * | | | | | Disable native upserts for sqlite, as they don't workErik Johnston2019-01-251-3/+7
| | |/ / / / | |/| | | |
* | | | | | 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-2538-409/+1140
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-253-0/+85
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synap...Andrew Morgan2019-01-243-3/+3
| | |\ \ \ \
| | | * | | | Apply suggestions from code reviewRichard van der Hoff2019-01-242-2/+2
| | | * | | | Update synapse/api/filtering.pyRichard van der Hoff2019-01-241-1/+1
| | * | | | | Remove redundant create event None checkAndrew Morgan2019-01-241-3/+0
| | |/ / / /
| | * | | | Do not return in a deferred functionAndrew Morgan2019-01-221-3/+3
| | * | | | Ensure new filter is actually createdAndrew Morgan2019-01-222-2/+1
| | * | | | Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-223-35/+51
| | * | | | Search for messages across predecessor roomsAndrew Morgan2019-01-183-0/+73
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-2530-364/+920
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-244-13/+66
| | |\ \ \ \ \
| | | * | | | | Review commentsErik Johnston2019-01-242-1/+7
| | | * | | | | Add room_version param to get_pduErik Johnston2019-01-234-13/+60
| | | | |_|_|/ | | | |/| | |
| | * | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-244-39/+34
| | |\ \ \ \ \
| | | * | | | | Update make_membership_event docsErik Johnston2019-01-241-2/+5
| | | * | | | | Remove unecessary setting of outlier bitErik Johnston2019-01-241-2/+0
| | | * | | | | Use term 'out of band membership' insteadErik Johnston2019-01-243-9/+10
| | | * | | | | Clarify the invite flowsErik Johnston2019-01-233-7/+24
| | | * | | | | Remove unnecessary '_sign_event'Erik Johnston2019-01-232-15/+8
| | | * | | | | Store rejected remote invite events as outliersErik Johnston2019-01-233-38/+21
| | | |/ / / /
| | * | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-245-4/+48
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fixAndrew Morgan2019-01-241-2/+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
| | * | | | | | Merge pull request #4464 from matrix-org/rav/fix_srv_lookupRichard van der Hoff2019-01-241-1/+2
| | |\ \ \ \ \ \
| | | * | | | | | Look up the right SRV recordRichard van der Hoff2019-01-241-1/+2
| | * | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460)Richard van der Hoff2019-01-241-2/+3
| | |/ / / / / /
| | * | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-243-8/+12
| | |\ \ \ \ \ \
| | | * | | | | | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-222-6/+5
| | | * | | | | | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-223-7/+12
| | * | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_docNeil Johnson2019-01-241-1/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Clarify docs for public_baseurlDavid Baker2019-01-241-1/+5
| | | | |/ / / / / | | | |/| | | | |
| | * / | | | | | Fix UPSERT check (#4459)Amber Brown2019-01-241-5/+28
| | |/ / / / / /
| | * | | | | | Use native UPSERTs where possible (#4306)Amber Brown2019-01-247-30/+212
| | * | | | | | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-241-3/+12
| | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backportAndrew Morgan2019-01-231-0/+6
| | |\ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-20 13:46:21 +0000