Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add changelog entry | Hubert Chathi | 2019-02-06 | 1 | -0/+1 |
* | fix import to make isort happy | Hubert Chathi | 2019-02-06 | 1 | -2/+7 |
* | add new endpoint to update backup versions | Hubert Chathi | 2019-02-06 | 3 | -1/+87 |
* | return proper error codes for some 404s | Hubert Chathi | 2019-02-06 | 1 | -4/+16 |
* | Merge pull request #4546 from matrix-org/rav/silence_critical_error_from_fede... | Richard van der Hoff | 2019-02-01 | 2 | -2/+16 |
|\ | |||||
| * | Fix noisy "twisted.internet.task.TaskStopped" errors in logs | Richard van der Hoff | 2019-02-01 | 2 | -2/+16 |
* | | Merge remote-tracking branch 'origin/release-v0.99.0' into develop | Richard van der Hoff | 2019-02-01 | 3 | -31/+78 |
|\ \ | |||||
| * \ | Merge pull request #4544 from matrix-org/rav/skip_invalid_well_known | Richard van der Hoff | 2019-02-01 | 3 | -30/+77 |
| |\ \ | |||||
| | * | | Treat an invalid .well-known the same as an absent one | Richard van der Hoff | 2019-02-01 | 3 | -30/+77 |
| * | | | Fix b'ab' noise in logs | Richard van der Hoff | 2019-02-01 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'release-v0.99.0' into develop | Richard van der Hoff | 2019-02-01 | 4 | -52/+86 |
|\| | | |||||
| * | | Merge pull request #4542 from matrix-org/rav/cache_for_bad_well_known | Richard van der Hoff | 2019-02-01 | 2 | -17/+59 |
| |\ \ | |||||
| | * | | changelog | Richard van der Hoff | 2019-02-01 | 1 | -0/+1 |
| | * | | Cache failures to parse .well-known | Richard van der Hoff | 2019-02-01 | 1 | -13/+43 |
| | * | | better logging for federation connections | Richard van der Hoff | 2019-01-31 | 1 | -5/+16 |
| * | | | Merge pull request #4539 from matrix-org/rav/update_wellknown_routing | Richard van der Hoff | 2019-02-01 | 3 | -35/+27 |
| |\| | | | |/ | |/| | |||||
| | * | Update federation routing logic to check .well-known before SRV | Richard van der Hoff | 2019-01-31 | 3 | -35/+27 |
| |/ | |||||
* | | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatable | Andrew Morgan | 2019-01-31 | 3 | -11/+38 |
|\ \ | |||||
| * | | Raise an exception instead of returning None | Andrew Morgan | 2019-01-31 | 1 | -2/+9 |
| * | | New function for getting room's create event | Andrew Morgan | 2019-01-31 | 2 | -18/+21 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad... | Andrew Morgan | 2019-01-31 | 90 | -84/+151 |
| |\ \ | |||||
| * | | | lint | Andrew Morgan | 2019-01-31 | 1 | -2/+4 |
| * | | | Add changelog | Andrew Morgan | 2019-01-30 | 1 | -0/+1 |
| * | | | Copy over non-federatable trait on room upgrade | Andrew Morgan | 2019-01-30 | 1 | -0/+14 |
* | | | | Merge branch 'release-v0.99.0' into develop | Richard van der Hoff | 2019-01-31 | 6 | -13/+103 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | v0.99.0rc3 v0.99.0rc3 | Richard van der Hoff | 2019-01-31 | 5 | -4/+22 |
| * | | Add some debug for membership syncing issues (#4538) | Richard van der Hoff | 2019-01-31 | 2 | -2/+12 |
| * | | Fix infinite loop when an event is redacted in a v3 room (#4535) | Richard van der Hoff | 2019-01-31 | 2 | -5/+33 |
| * | | update debian installation instructions (#4526) | Richard van der Hoff | 2019-01-31 | 2 | -5/+32 |
| * | | cleanups for contrib/prometheus/README | Richard van der Hoff | 2019-01-30 | 1 | -0/+7 |
* | | | Reject large transactions on federation (#4513) | Andrew Morgan | 2019-01-31 | 2 | -0/+17 |
* | | | Merge remote-tracking branch 'origin/release-v0.99.0' into develop | Richard van der Hoff | 2019-01-30 | 86 | -84/+117 |
|\| | | |||||
| * | | v0.99.0rc2 v0.99.0rc2 | Richard van der Hoff | 2019-01-30 | 4 | -3/+18 |
| * | | Merge remote-tracking branch 'origin/develop' into release-v0.99.0 | Richard van der Hoff | 2019-01-30 | 2 | -1/+14 |
| |\ \ | |||||
| * | | | ACME Upgrade Docs (#4528) | Amber Brown | 2019-01-30 | 2 | -0/+33 |
| * | | | Update constants.py | Neil Johnson | 2019-01-30 | 1 | -1/+1 |
| * | | | 0.99.0rc1 v0.99.0rc1 | Richard van der Hoff | 2019-01-30 | 83 | -82/+67 |
| | |/ | |/| | |||||
* | | | by default include m.room.encryption on invites (#3902) | Matthew Hodgson | 2019-01-30 | 3 | -0/+4 |
| |/ |/| | |||||
* | | Merge pull request #4527 from matrix-org/erikj/fix_sending_remote_invite_reje... | Erik Johnston | 2019-01-30 | 2 | -1/+14 |
|\ \ | |/ |/| | |||||
| * | Newsfile | Erik Johnston | 2019-01-30 | 1 | -0/+1 |
| * | Fix remote invite rejections not comming down sync | Erik Johnston | 2019-01-30 | 1 | -1/+13 |
|/ | |||||
* | Merge pull request #4472 from matrix-org/neilj/room_capabilities | Erik Johnston | 2019-01-30 | 5 | -0/+153 |
|\ | |||||
| * | Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ... | Neil Johnson | 2019-01-30 | 123 | -669/+2451 |
| |\ | |||||
| | * | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 123 | -669/+2451 |
| | |\ | |||||
| * | | | isort | Neil Johnson | 2019-01-30 | 1 | -2/+1 |
| |/ / | |||||
| * | | define room dispositions for use in exposing room capabilities | Neil Johnson | 2019-01-30 | 1 | -0/+5 |
| * | | formatting and use constants where available | Neil Johnson | 2019-01-30 | 1 | -19/+17 |
| * | | Populate default room version from Constants | Neil Johnson | 2019-01-30 | 1 | -1/+2 |
| * | | reflect that rooms v3 is a stable room version | Neil Johnson | 2019-01-30 | 2 | -0/+2 |
| * | | rework format of change password capability | Neil Johnson | 2019-01-29 | 2 | -3/+5 |
| * | | update to reflect broadening scope | Neil Johnson | 2019-01-29 | 1 | -1/+1 |
| * | | support change_password in capabilities end-point | Neil Johnson | 2019-01-29 | 2 | -2/+35 |
| * | | isort | Neil Johnson | 2019-01-29 | 1 | -1/+2 |
| * | | enforce auth for capabilities endpoint | Neil Johnson | 2019-01-29 | 2 | -14/+36 |
| * | | register capabilities servlet | Neil Johnson | 2019-01-29 | 1 | -0/+2 |
| * | | backout v3 | Neil Johnson | 2019-01-25 | 2 | -2/+0 |
| * | | Support room version capabilities in CS API (MSC1804) | Neil Johnson | 2019-01-25 | 2 | -0/+88 |
| * | | towncrier | Neil Johnson | 2019-01-25 | 1 | -0/+1 |
| * | | track unstable room v3 | Neil Johnson | 2019-01-25 | 1 | -0/+2 |
* | | | Fix replication for room v3 (#4523) | Erik Johnston | 2019-01-30 | 2 | -1/+5 |
* | | | ACME config cleanups (#4525) | Richard van der Hoff | 2019-01-30 | 5 | -60/+115 |
* | | | Merge pull request #4524 from matrix-org/erikj/fix_no_tls | Erik Johnston | 2019-01-30 | 2 | -1/+4 |
|\ \ \ | |||||
| * | | | Raise ConfigError instead | Erik Johnston | 2019-01-30 | 1 | -1/+3 |
| * | | | Newsfile | Erik Johnston | 2019-01-30 | 1 | -0/+1 |
| * | | | _listener_http should return a list | Erik Johnston | 2019-01-30 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #4521 from matrix-org/rav/fed_routing/cleanups | Richard van der Hoff | 2019-01-30 | 2 | -9/+12 |
|\ \ \ | |||||
| * | | | newsfile | Richard van der Hoff | 2019-01-30 | 1 | -0/+1 |
| * | | | fix exception text | Richard van der Hoff | 2019-01-30 | 1 | -1/+1 |
| * | | | Also jitter the invalid cache period | Richard van der Hoff | 2019-01-30 | 1 | -9/+11 |
* | | | | Follow redirects on .well-known (#4520) | Richard van der Hoff | 2019-01-30 | 3 | -2/+102 |
* | | | | SIGHUP for TLS cert reloading (#4495) | Amber Brown | 2019-01-30 | 5 | -20/+81 |
|/ / / | |||||
* | | | Add a caching layer to .well-known responses (#4516) | Richard van der Hoff | 2019-01-30 | 6 | -10/+493 |
* | | | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 12 | -102/+94 |
| |/ |/| | |||||
* | | Merge pull request #4486 from xperimental/workaround-4216 | Richard van der Hoff | 2019-01-30 | 2 | -1/+5 |
|\ \ | |||||
| * | | Implement workaround for login error. | Robert Jacob | 2019-01-30 | 2 | -1/+5 |
* | | | Merge pull request #4515 from matrix-org/erikj/room_version_v3 | Erik Johnston | 2019-01-29 | 5 | -4/+14 |
|\ \ \ | |||||
| * | | | No vdh tests! | Erik Johnston | 2019-01-29 | 1 | -2/+1 |
| * | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| * | | | Enable room version v3 | Erik Johnston | 2019-01-29 | 4 | -4/+14 |
|/ / / | |||||
* | | | Merge pull request #4499 from matrix-org/erikj/redactions_eiah | Erik Johnston | 2019-01-29 | 8 | -16/+77 |
|\ \ \ | |||||
| * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions... | Erik Johnston | 2019-01-29 | 9 | -46/+77 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #4514 from matrix-org/erikj/remove_event_id | Erik Johnston | 2019-01-29 | 9 | -47/+83 |
|\ \ \ \ | |||||
| * | | | | Update comment | Erik Johnston | 2019-01-29 | 1 | -3/+3 |
| * | | | | check event format version not room version | Erik Johnston | 2019-01-29 | 1 | -2/+2 |
| * | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| * | | | | Don't assert an event must have an event ID | Erik Johnston | 2019-01-29 | 1 | -2/+3 |
| * | | | | Only check event ID domain for signatures for V1 events | Erik Johnston | 2019-01-29 | 3 | -31/+44 |
| * | | | | Use event origin for filtering incoming events | Erik Johnston | 2019-01-29 | 1 | -4/+7 |
| * | | | | Use snder and not event ID domain to check if ours | Erik Johnston | 2019-01-29 | 2 | -1/+9 |
| * | | | | Remove event ID usage when checking if new room | Erik Johnston | 2019-01-29 | 1 | -1/+2 |
| * | | | | Only check event IDs domain signed event for V1 and V2 | Erik Johnston | 2019-01-29 | 1 | -5/+14 |
| | * | | | Fixup comment | Erik Johnston | 2019-01-29 | 1 | -2/+2 |
| | * | | | kill vdh test some more | Erik Johnston | 2019-01-29 | 1 | -2/+1 |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions... | Erik Johnston | 2019-01-29 | 54 | -288/+1051 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #4483 from matrix-org/erikj/event_v2 | Erik Johnston | 2019-01-29 | 5 | -19/+109 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| * | | | | | Implement event format v2 | Erik Johnston | 2019-01-29 | 4 | -19/+108 |
* | | | | | | Merge pull request #4512 from matrix-org/anoa/consent_dir | Andrew Morgan | 2019-01-29 | 3 | -11/+15 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add changelog | Andrew Morgan | 2019-01-29 | 1 | -0/+1 |
| * | | | | | Check consent dir path on startup | Andrew Morgan | 2019-01-29 | 2 | -11/+14 |
* | | | | | | Relax requirement for a content-type on .well-known (#4511) | Richard van der Hoff | 2019-01-29 | 3 | -21/+14 |
* | | | | | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurl | Travis Ralston | 2019-01-29 | 2 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Create 4498.misc | Travis Ralston | 2019-01-28 | 1 | -0/+1 |
| * | | | | | Don't recommend :8448 to people on public_baseurl | Travis Ralston | 2019-01-28 | 1 | -1/+1 |
* | | | | | | Do not generate self-signed TLS certificates by default. (#4509) | Amber Brown | 2019-01-29 | 4 | -45/+94 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #4481 from matrix-org/erikj/event_builder | Erik Johnston | 2019-01-29 | 10 | -164/+288 |
|\ \ \ \ \ | |||||
| * | | | | | Correctly set context.app_service | Erik Johnston | 2019-01-29 | 1 | -0/+2 |
| * | | | | | Don't set event_id twice | Erik Johnston | 2019-01-29 | 1 | -2/+0 |
| * | | | | | Remove dead function | Erik Johnston | 2019-01-29 | 1 | -11/+0 |
| * | | | | | Fix test to use valid event format | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| * | | | | | Replace usage of builder.user_id with builder.sender | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| * | | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| * | | | | | Refactor event building into EventBuilder | Erik Johnston | 2019-01-29 | 5 | -112/+254 |
| * | | | | | Make add_hashes_and_signatures operate on dicts | Erik Johnston | 2019-01-29 | 2 | -40/+32 |
* | | | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489) | Richard van der Hoff | 2019-01-29 | 23 | -21/+470 |
* | | | | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signature | Erik Johnston | 2019-01-29 | 3 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| * | | | | | | Fixup calls to `comput_event_signature` | Erik Johnston | 2019-01-29 | 2 | -2/+2 |
* | | | | | | | Enable configuring test log level via env var (#4506) | Richard van der Hoff | 2019-01-29 | 4 | -30/+80 |
| | | | * | | | Update synapse/storage/events_worker.py | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | * | | | Check redaction state when event is pulled out of the database | Erik Johnston | 2019-01-29 | 1 | -0/+13 |
| | | | * | | | Fix typo | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | * | | | Remove unused arg | Erik Johnston | 2019-01-29 | 1 | -2/+1 |
| | | | * | | | Drop vdh support | Erik Johnston | 2019-01-29 | 4 | -6/+2 |
| | | | * | | | Add docstring | Erik Johnston | 2019-01-29 | 1 | -0/+12 |
| | | | * | | | Update synapse/storage/events_worker.py | Richard van der Hoff | 2019-01-29 | 1 | -1/+1 |
| | | | * | | | Finish comment... | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | * | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| | | | * | | | Implement rechecking of redactions | Erik Johnston | 2019-01-29 | 5 | -10/+53 |
| | | | * | | | Add RoomVersions.V3 constant, without enabling it | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #4496 from matrix-org/erikj/invite_fallback | Erik Johnston | 2019-01-29 | 3 | -14/+90 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-01-28 | 1 | -0/+1 |
| * | | | | | Implement fallback for V2 invite API | Erik Johnston | 2019-01-28 | 2 | -14/+89 |
* | | | | | | Make linearizer more quiet (#4507) | Amber Brown | 2019-01-29 | 2 | -5/+6 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validator | Erik Johnston | 2019-01-29 | 4 | -26/+46 |
|\ \ \ \ \ | |||||
| * | | | | | Remove duplicate checks | Erik Johnston | 2019-01-29 | 1 | -14/+0 |
| * | | | | | Fix up error messages | Erik Johnston | 2019-01-29 | 1 | -2/+2 |
| * | | | | | Fold validate into validate_new | Erik Johnston | 2019-01-29 | 1 | -16/+11 |
| * | | | | | Newsfile | Erik Johnston | 2019-01-28 | 1 | -0/+1 |
| * | | | | | Split up event validation between event and builder | Erik Johnston | 2019-01-28 | 3 | -23/+61 |
* | | | | | | Fix receiving events from federation via a worker | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
* | | | | | | Fix typo in upserts code (#4505) | Amber Brown | 2019-01-29 | 2 | -1/+2 |
* | | | | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signing | Erik Johnston | 2019-01-29 | 3 | -42/+105 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Newsfile | Erik Johnston | 2019-01-28 | 1 | -0/+1 |
| * | | | | | | Refactor event signing to work on dicts | Erik Johnston | 2019-01-28 | 2 | -42/+104 |
| |/ / / / / | |||||
* | | | | | | Use SimpleResolverComplexifier in tests (#4497) | Richard van der Hoff | 2019-01-29 | 3 | -32/+17 |
* | | | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_version | Erik Johnston | 2019-01-28 | 11 | -28/+71 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Correctly use default room version if none is set | Erik Johnston | 2019-01-28 | 1 | -2/+2 |
| * | | | | | Newsfile | Erik Johnston | 2019-01-25 | 1 | -0/+1 |
| * | | | | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 10 | -27/+69 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fix worker TLS (#4492) | Amber Brown | 2019-01-28 | 8 | -48/+49 |
| |/ / / |/| | | | |||||
* | | | | Fix UPSERTs on SQLite 3.24+ (#4477) | Amber Brown | 2019-01-28 | 8 | -18/+30 |
* | | | | Merge pull request #4412 from matrix-org/anoa/dm_room_upgrade | Andrew Morgan | 2019-01-28 | 5 | -18/+83 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Change return syntax in doc string | Andrew Morgan | 2019-01-28 | 1 | -1/+1 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg... | Andrew Morgan | 2019-01-28 | 32 | -123/+556 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Remove --process-dependency-links from UPGRADE.rst (#4485) | Aaron Raimist | 2019-01-28 | 2 | -1/+2 |
* | | | | Merge pull request #4488 from matrix-org/rav/fed_routing/refactor | Richard van der Hoff | 2019-01-28 | 3 | -35/+120 |
|\ \ \ \ | |||||
| * | | | | docstrings for _RoutingResult | Richard van der Hoff | 2019-01-28 | 1 | -0/+36 |
| * | | | | changelog | Richard van der Hoff | 2019-01-28 | 1 | -0/+1 |
| * | | | | Handle IP literals explicitly | Richard van der Hoff | 2019-01-28 | 2 | -17/+21 |
| * | | | | MatrixFederationAgent: factor out routing logic | Richard van der Hoff | 2019-01-28 | 1 | -18/+62 |
|/ / / / | |||||
* | / / | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487) | Richard van der Hoff | 2019-01-28 | 3 | -12/+193 |
| |/ / |/| | | |||||
* | | | Merge pull request #4470 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 17 | -86/+220 |
|\ \ \ | |||||
| * | | | Newsfile | Erik Johnston | 2019-01-25 | 1 | -0/+1 |
| * | | | Replace missed usages of FrozenEvent | Erik Johnston | 2019-01-25 | 3 | -10/+14 |
| * | | | Fix tests | Erik Johnston | 2019-01-25 | 5 | -4/+14 |
| * | | | Require event format version to parse or create events | Erik Johnston | 2019-01-25 | 8 | -72/+191 |
* | | | | Merge pull request #4471 from matrix-org/erikj/sqlite_native_upsert | Erik Johnston | 2019-01-25 | 3 | -4/+9 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_nat... | Erik Johnston | 2019-01-25 | 13 | -7/+120 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Fix quoting for allowed_local_3pids example config (#4476) | Richard van der Hoff | 2019-01-25 | 2 | -3/+4 |
* | | | | | Fix Host header sent by MatrixFederationAgent (#4468) | Richard van der Hoff | 2019-01-25 | 5 | -2/+28 |
* | | | | | Don't require sqlite3 when using postgres (#4466) | Andrew Morgan | 2019-01-25 | 2 | -2/+2 |
| * | | | | Newsfile | Erik Johnston | 2019-01-25 | 2 | -1/+2 |
| * | | | | Disable native upserts for sqlite, as they don't work | Erik Johnston | 2019-01-25 | 1 | -3/+7 |
| |/ / / | |||||
| | * | | Reuse predecessor method | Andrew Morgan | 2019-01-28 | 1 | -12/+8 |
| | * | | Fixes | Andrew Morgan | 2019-01-25 | 1 | -39/+39 |
| | * | | Clean up direct_rooms access | Andrew Morgan | 2019-01-25 | 1 | -3/+3 |
| | * | | Use python magic | Andrew Morgan | 2019-01-25 | 1 | -2/+1 |
| | * | | Destructure account data tuple before use | Andrew Morgan | 2019-01-25 | 1 | -3/+3 |
| | * | | Remove unnecessary null check | Andrew Morgan | 2019-01-25 | 1 | -7/+6 |
| | * | | Move room_tag declaration to be closer to its use | Andrew Morgan | 2019-01-25 | 1 | -4/+5 |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg... | Andrew Morgan | 2019-01-25 | 75 | -1069/+1683 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms | Andrew Morgan | 2019-01-25 | 4 | -0/+86 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synap... | Andrew Morgan | 2019-01-24 | 3 | -3/+3 |
| |\ \ \ | |||||
| | * | | | Apply suggestions from code review | Richard van der Hoff | 2019-01-24 | 2 | -2/+2 |
| | * | | | Update synapse/api/filtering.py | Richard van der Hoff | 2019-01-24 | 1 | -1/+1 |
| * | | | | Remove redundant create event None check | Andrew Morgan | 2019-01-24 | 1 | -3/+0 |
| |/ / / | |||||
| * | | | Do not return in a deferred function | Andrew Morgan | 2019-01-22 | 1 | -3/+3 |
| * | | | Ensure new filter is actually created | Andrew Morgan | 2019-01-22 | 2 | -2/+1 |
| * | | | Fix a bug with single-room search searching all rooms | Andrew Morgan | 2019-01-22 | 3 | -35/+51 |
| * | | | Add changelog | Andrew Morgan | 2019-01-18 | 1 | -0/+1 |
| * | | | Search for messages across predecessor rooms | Andrew Morgan | 2019-01-18 | 3 | -0/+73 |
* | | | | Merge pull request #4447 from matrix-org/erikj/msc_1813 | Erik Johnston | 2019-01-25 | 5 | -7/+37 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813 | Erik Johnston | 2019-01-25 | 63 | -1025/+1459 |
| |\ \ \ \ | |||||
| * | | | | | Review comments | Erik Johnston | 2019-01-24 | 2 | -2/+4 |
* | | | | | | Merge pull request #4469 from matrix-org/revert-4451-erikj/require_format_ver... | Erik Johnston | 2019-01-25 | 18 | -253/+91 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Require event format version to parse or create events" | Erik Johnston | 2019-01-25 | 18 | -253/+91 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4451 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 18 | -91/+253 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_fo... | Erik Johnston | 2019-01-24 | 38 | -698/+509 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions | Erik Johnston | 2019-01-24 | 5 | -13/+67 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Review comments | Erik Johnston | 2019-01-24 | 2 | -1/+7 |
* | | | | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invites | Erik Johnston | 2019-01-24 | 5 | -39/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update make_membership_event docs | Erik Johnston | 2019-01-24 | 1 | -2/+5 |
| * | | | | | | | Remove unecessary setting of outlier bit | Erik Johnston | 2019-01-24 | 1 | -2/+0 |
| * | | | | | | | Use term 'out of band membership' instead | Erik Johnston | 2019-01-24 | 3 | -9/+10 |
* | | | | | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2 | Erik Johnston | 2019-01-24 | 6 | -4/+49 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fix | Andrew Morgan | 2019-01-24 | 2 | -2/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Change default timeout value from 0 to None | Andrew Morgan | 2019-01-24 | 1 | -1/+1 |
| * | | | | | | | | Use self.clock instead of datetime | Andrew Morgan | 2019-01-24 | 1 | -4/+3 |
| * | | | | | | | | isort | Andrew Morgan | 2019-01-24 | 1 | -1/+1 |
| * | | | | | | | | Add changelog | Andrew Morgan | 2019-01-24 | 1 | -0/+1 |
| * | | | | | | | | lint | Andrew Morgan | 2019-01-24 | 1 | -1/+2 |
| * | | | | | | | | Time out filtered room dir queries after 60s | Andrew Morgan | 2019-01-24 | 1 | -2/+12 |
* | | | | | | | | | Merge pull request #4464 from matrix-org/rav/fix_srv_lookup | Richard van der Hoff | 2019-01-24 | 3 | -12/+89 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Look up the right SRV record | Richard van der Hoff | 2019-01-24 | 3 | -4/+12 |
| * | | | | | | | | | lots more tests for MatrixFederationAgent | Richard van der Hoff | 2019-01-24 | 1 | -10/+79 |
* | | | | | | | | | | Generate the debian config during build (#4444) | Richard van der Hoff | 2019-01-24 | 4 | -617/+33 |
* | | | | | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460) | Richard van der Hoff | 2019-01-24 | 2 | -2/+4 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 5 | -9/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | move guard out of is_threepid_reserved and into register.py | Neil Johnson | 2019-01-22 | 3 | -7/+6 |
| * | | | | | | | | | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 5 | -8/+16 |
* | | | | | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_doc | Neil Johnson | 2019-01-24 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Changelog | David Baker | 2019-01-24 | 1 | -0/+1 |
| * | | | | | | | | | | Clarify docs for public_baseurl | David Baker | 2019-01-24 | 1 | -1/+5 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* / | | | | | | | | | Fix UPSERT check (#4459) | Amber Brown | 2019-01-24 | 2 | -5/+29 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Use native UPSERTs where possible (#4306) | Amber Brown | 2019-01-24 | 14 | -43/+238 |
* | | | | | | | | | Don't send IP addresses as SNI (#4452) | Richard van der Hoff | 2019-01-24 | 3 | -6/+73 |
| | | | | * | | | | Replace missed usages of FrozenEvent | Erik Johnston | 2019-01-24 | 3 | -10/+14 |
| | | | | * | | | | Fix tests | Erik Johnston | 2019-01-24 | 5 | -4/+14 |
| | | | | * | | | | Newsfile | Erik Johnston | 2019-01-23 | 1 | -0/+1 |
| | | | | * | | | | Require event format version to parse or create events | Erik Johnston | 2019-01-23 | 8 | -74/+193 |
| | | | | * | | | | Merge branch 'erikj/fixup_rejecting_invites' of github.com:matrix-org/synapse... | Erik Johnston | 2019-01-23 | 5 | -37/+32 |
| | | | | |\ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | | * | | | | | | Clarify the invite flows | Erik Johnston | 2019-01-23 | 3 | -7/+24 |
| | | * | | | | | | Remove unnecessary '_sign_event' | Erik Johnston | 2019-01-23 | 2 | -15/+8 |
| | | * | | | | | | Newsfile | Erik Johnston | 2019-01-23 | 1 | -0/+1 |
| | | * | | | | | | Store rejected remote invite events as outliers | Erik Johnston | 2019-01-23 | 3 | -38/+21 |
| |_|/ / / / / / |/| | | | | | | | |||||
| | | | * | | | | Merge branch 'erikj/get_pdu_versions' into erikj/require_format_version | Erik Johnston | 2019-01-23 | 29 | -309/+937 |
| | | | |\ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Newsfile | Erik Johnston | 2019-01-23 | 1 | -0/+1 |
| | | * | | | | | Add room_version param to get_pdu | Erik Johnston | 2019-01-23 | 4 | -13/+60 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backport | Andrew Morgan | 2019-01-23 | 2 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add changelog | Andrew Morgan | 2019-01-23 | 1 | -0/+1 |
| * | | | | | | | Add metric for user dir current event stream position | Andrew Morgan | 2019-01-23 | 1 | -0/+6 |
* | | | | | | | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agent | Richard van der Hoff | 2019-01-23 | 9 | -258/+555 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | fix python2 test failure | Richard van der Hoff | 2019-01-23 | 1 | -1/+1 |
| * | | | | | | | Add a test for MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -1/+195 |
| * | | | | | | | put resolve_service in an object | Richard van der Hoff | 2019-01-22 | 3 | -83/+104 |
| * | | | | | | | Require that service_name be a byte string | Richard van der Hoff | 2019-01-22 | 2 | -8/+8 |
| * | | | | | | | changelog | Richard van der Hoff | 2019-01-22 | 1 | -0/+1 |
| * | | | | | | | Kill off matrix_federation_endpoint | Richard van der Hoff | 2019-01-22 | 2 | -145/+0 |
| * | | | | | | | Make MatrixFederationClient use MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -27/+106 |