Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Also jitter the invalid cache period | Richard van der Hoff | 2019-01-30 | 1 | -9/+11 |
| | |||||
* | 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. | ||||
| * | Implement workaround for login error. | Robert Jacob | 2019-01-30 | 2 | -1/+5 |
| | | | | | | | | Signed-off-by: Robert Jacob <xperimental@solidproject.de> | ||||
* | | Merge pull request #4515 from matrix-org/erikj/room_version_v3 | Erik Johnston | 2019-01-29 | 5 | -4/+14 |
|\ \ | | | | | | | Enable support for room version 3 | ||||
| * | | 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 |
|\ \ | | | | | | | Implement rechecking of redactions for room versions v3 | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-29 | 9 | -46/+77 |
| |\ \ | |/ / |/| | | | | | erikj/redactions_eiah | ||||
* | | | Merge pull request #4514 from matrix-org/erikj/remove_event_id | Erik Johnston | 2019-01-29 | 9 | -47/+83 |
|\ \ \ | | | | | | | | | Remove usages of event ID's domain | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | In future version events won't have an event ID, so we won't be able to do this check. | ||||
| * | | | Use event origin for filtering incoming events | Erik Johnston | 2019-01-29 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | We only process events sent to us from a server if the event ID matches the server, to help guard against federation storms. We replace this with a check against the event origin. | ||||
| * | | | Use snder and not event ID domain to check if ours | Erik Johnston | 2019-01-29 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | The transaction queue only sends out events that we generate. This was done by checking domain of event ID, but that can no longer be used. Instead, we may as well use the sender field. | ||||
| * | | | Remove event ID usage when checking if new room | Erik Johnston | 2019-01-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | The event ID is changing, so we can no longer get the domain from it. On the other hand, the check is unnecessary. | ||||
| * | | | Only check event IDs domain signed event for V1 and V2 | Erik Johnston | 2019-01-29 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | Since newer versions of events don't have the same format for event ID. | ||||
| | * | | 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 ↵ | Erik Johnston | 2019-01-29 | 54 | -288/+1051 |
| | |\ \ | |_|/ / |/| | | | | | | | erikj/redactions_eiah | ||||
* | | | | Merge pull request #4483 from matrix-org/erikj/event_v2 | Erik Johnston | 2019-01-29 | 5 | -19/+109 |
|\ \ \ \ | | | | | | | | | | | Implement event format V2 | ||||
| * | | | | 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 |
|\ \ \ \ \ | |/ / / / |/| | | | | Check consent dir path on startup | ||||
| * | | | | 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 |
|\ \ \ \ \ | |/ / / / |/| | | | | Don't recommend :8448 to people on public_baseurl | ||||
| * | | | | 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 |
|\ \ \ \ | | | | | | | | | | | Refactor event building into EventBuilder | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | `.user_id` is proxed to `.sender` in FrozenEvent, so this has no functional change | ||||
| * | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Refactor event building into EventBuilder | Erik Johnston | 2019-01-29 | 5 | -112/+254 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is so that everything is done in one place, making it easier to change the event format based on room version | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixup calls to `comput_event_signature` | ||||
| * | | | | | Newsfile | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fixup calls to `comput_event_signature` | Erik Johnston | 2019-01-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently pass FrozenEvent instead of `dict` to `compute_event_signature`, which works by accident due to `dict(event)` producing the correct result. This fixes PR #4493 commit 855a151 | ||||
* | | | | | | Enable configuring test log level via env var (#4506) | Richard van der Hoff | 2019-01-29 | 4 | -30/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | I got fed up with always adding '@unittest.DEBUG' every time I needed to debug a test. | ||||
| | | | * | | 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 |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re> | ||||
| | | | * | | 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 |
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | We add the constant, but don't add it to the known room versions. This lets us start adding V3 logic, but the servers will never join or create V3 rooms | ||||
* | | | | | Merge pull request #4496 from matrix-org/erikj/invite_fallback | Erik Johnston | 2019-01-29 | 3 | -14/+90 |
|\ \ \ \ \ | |/ / / / |/| | | | | Implement fallback for V2 invite API | ||||
| * | | | | Newsfile | Erik Johnston | 2019-01-28 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Implement fallback for V2 invite API | Erik Johnston | 2019-01-28 | 2 | -14/+89 |
| | | | | | | | | | | | | | | | | | | | | | | | | | If the room version is either 1 or 2 then a server should retry failed `/v2/invite` requests with the v1 API | ||||
* | | | | | 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 |
|\ \ \ \ | | | | | | | | | | | Split up event validation between event and builder | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The validator was being run on the EventBuilder objects, and so the validator only checked a subset of fields. With the upcoming EventBuilder refactor even fewer fields will be there to validate. To get around this we split the validation into those that can be run against an EventBuilder and those run against a fully fledged event. | ||||
* | | | | | Fix receiving events from federation via a worker | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This bug was introduced in PR #4470, commit 678a92cb56d547dcadffa723e29b4855a27d0901 | ||||
* | | | | | Fix typo in upserts code (#4505) | Amber Brown | 2019-01-29 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix obvious problem :| * changelog | ||||
* | | | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signing | Erik Johnston | 2019-01-29 | 3 | -42/+105 |
|\ \ \ \ \ | | | | | | | | | | | | | Refactor event signing to work on dicts | ||||
| * | | | | | Newsfile | Erik Johnston | 2019-01-28 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Refactor event signing to work on dicts | Erik Johnston | 2019-01-28 | 2 | -42/+104 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for making EventBuilder format agnostic, which means event signing should be done against the event dict rather than the EventBuilder object. | ||||
* | | | | | Use SimpleResolverComplexifier in tests (#4497) | Richard van der Hoff | 2019-01-29 | 3 | -32/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | two reasons for this. One, it saves a bunch of boilerplate. Two, it squashes unicode to IDNA-in-a-`str` (even on python 3) in a way that it turns out we rely on to give consistent behaviour between python 2 and 3. | ||||
* | | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_version | Erik Johnston | 2019-01-28 | 11 | -28/+71 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Pass through room version to event auth | ||||
| * | | | | 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 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | * load cert * changelog * fix | ||||
* | | | 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 |
|\ \ \ | |_|/ |/| | | Migrate direct message and tag state on room upgrade | ||||
| * | | Change return syntax in doc string | Andrew Morgan | 2019-01-28 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-01-28 | 32 | -123/+556 |
| |\ \ | |/ / |/| | | | | | anoa/dm_room_upgrade | ||||
* | | | Remove --process-dependency-links from UPGRADE.rst (#4485) | Aaron Raimist | 2019-01-28 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove --process-dependency-links from UPGRADE.rst Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
* | | | Merge pull request #4488 from matrix-org/rav/fed_routing/refactor | Richard van der Hoff | 2019-01-28 | 3 | -35/+120 |
|\ \ \ | | | | | | | | | Refactoring in MatrixFederationAgent | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | We don't want to be doing .well-known lookups on these guys. | ||||
| * | | | MatrixFederationAgent: factor out routing logic | Richard van der Hoff | 2019-01-28 | 1 | -18/+62 |
|/ / / | | | | | | | | | | This is going to get too big and unmanageable. | ||||
* | / | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487) | Richard van der Hoff | 2019-01-28 | 3 | -12/+193 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that the library does a better job of parsing URIs than our reinvented wheel. Who knew. There are two things going on here. The first is that, unlike parse_server_name, URI.fromBytes will strip off square brackets from IPv6 literals, which means that it is valid input to ClientTLSOptionsFactory and HostnameEndpoint. The second is that we stay in `bytes` throughout (except for the argument to ClientTLSOptionsFactory), which avoids the weirdness of (sometimes) ending up with idna-encoded values being held in `unicode` variables. TBH it probably would have been ok but it made the tests fragile. | ||||
* | | Merge pull request #4470 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 17 | -86/+220 |
|\ \ | | | | | | | Require event format version to parse or create events | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | Disable native upsert on sqlite | ||||
| * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-25 | 13 | -7/+120 |
| |\ \ \ | |/ / / |/| | | | | | | | erikj/sqlite_native_upsert | ||||
* | | | | Fix quoting for allowed_local_3pids example config (#4476) | Richard van der Hoff | 2019-01-25 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use double-quotes here, you have to escape your backslashes. It's much easier with single-quotes. (Note that the existing double-backslashes are already interpreted by python's """ parsing.) | ||||
* | | | | Fix Host header sent by MatrixFederationAgent (#4468) | Richard van der Hoff | 2019-01-25 | 5 | -2/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Move the Host header logic down here so that (a) it is used if we reuse the agent elsewhere, and (b) we can mess about with it with .well-known. | ||||
* | | | | 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 ↵ | Andrew Morgan | 2019-01-25 | 75 | -1069/+1683 |
| | |\ | |_|/ |/| | | | | | anoa/dm_room_upgrade | ||||
* | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms | Andrew Morgan | 2019-01-25 | 4 | -0/+86 |
|\ \ \ | |/ / |/| | | Ability to search entire room history after upgrading room | ||||
| * | | Merge branch 'anoa/full_search_upgraded_rooms' of ↵ | Andrew Morgan | 2019-01-24 | 3 | -3/+3 |
| |\ \ | | | | | | | | | | | | | github.com:matrix-org/synapse into anoa/full_search_upgraded_rooms | ||||
| | * | | Apply suggestions from code review | Richard van der Hoff | 2019-01-24 | 2 | -2/+2 |
| | | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> | ||||
| | * | | Update synapse/api/filtering.py | Richard van der Hoff | 2019-01-24 | 1 | -1/+1 |
| | | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | * Create a new method for getting predecessor rooms * Remove formatting change | ||||
| * | | Add changelog | Andrew Morgan | 2019-01-18 | 1 | -0/+1 |
| | | | |||||
| * | | Search for messages across predecessor rooms | Andrew Morgan | 2019-01-18 | 3 | -0/+73 |
| | | | | | | | | | | | | Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> | ||||
* | | | Merge pull request #4447 from matrix-org/erikj/msc_1813 | Erik Johnston | 2019-01-25 | 5 | -7/+37 |
|\ \ \ | | | | | | | | | Implement MSC 1813 - Add room version to make APIs | ||||
| * \ \ | 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 ↵ | Erik Johnston | 2019-01-25 | 18 | -253/+91 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/revert-4451-erikj/require_format_version Revert "Require event format version to parse or create events" | ||||
| * | | | | | 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 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Require event format version to parse or create events | ||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-24 | 38 | -698/+509 |
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | erikj/require_format_version | ||||
* | | | | | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions | Erik Johnston | 2019-01-24 | 5 | -13/+67 |
|\ \ \ \ \ | | | | | | | | | | | | | Add room_version param to get_pdu | ||||
| * | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Store rejected remote invite events as outliers | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add support for persisting event format versions | ||||
* \ \ \ \ \ \ \ | Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fix | Andrew Morgan | 2019-01-24 | 2 | -2/+13 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add a 60s timeout to filtered room directory queries | ||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | MatrixFederationAgent: Look up the right SRV record | ||||
| * | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than hardcoding a config which we always forget to update, generate it from the default config. | ||||
* | | | | | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460) | Richard van der Hoff | 2019-01-24 | 2 | -2/+4 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | This could cause exceptions if the id server returned 4xx responses. | ||||
* | | | | | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 5 | -9/+16 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Neilj/fix threepid auth check | ||||
| * | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Clarify docs for public_baseurl | ||||
| * | | | | | | | | | | Changelog | David Baker | 2019-01-24 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Clarify docs for public_baseurl | David Baker | 2019-01-24 | 1 | -1/+5 |
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is leading to problems with people upgrading to clients that support MSC1730 because people have this misconfigured, so try to make the docs completely unambiguous. | ||||
* / | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is that we have cut-and-pasted an impl from Twisted, and then failed to maintain it. It was fixed in Twisted in https://github.com/twisted/twisted/pull/1047/files; let's do the same here. | ||||
| | | | | * | | | | 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 ↵ | Erik Johnston | 2019-01-23 | 5 | -37/+32 |
| | | | | |\ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | github.com:matrix-org/synapse into erikj/require_format_version | ||||
| | | * | | | | | | 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 |
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently they're stored as non-outliers even though the server isn't in the room, which can be problematic in places where the code assumes it has the state for all non outlier events. In particular, there is an edge case where persisting the leave event triggers a state resolution, which requires looking up the room version from state. Since the server doesn't have the state, this causes an exception to be thrown. | ||||
| | | | * | | | | 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 |
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | When we add new event format we'll need to know the event format or room version when parsing events. | ||||
* | | | | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backport | Andrew Morgan | 2019-01-23 | 2 | -0/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add metric for user dir current event stream position | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Move SRV magic into an Agent-like thing | ||||
| * | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes it easier to stub things out for tests. | ||||
| * | | | | | | | Require that service_name be a byte string | Richard van der Hoff | 2019-01-22 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is only ever a bytes now, so let's enforce that. | ||||
| * | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this thing is now redundant. | ||||
| * | | | | | | | Make MatrixFederationClient use MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -27/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... instead of the matrix_federation_endpoint | ||||
| * | | | | | | | MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -0/+147 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull the magic that is currently in matrix_federation_endpoint and friends into an agent-like thing | ||||
* | | | | | | | | debian package: symlink to python-3.X (#4433) | Richard van der Hoff | 2019-01-23 | 3 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the debian package, make the virtualenv symlink python to /usr/bin/python3.X rather than /usr/bin/python3. Also make sure we depend on the right python3.x package. This might help a bit with subtle failures when people install a package from the wrong distro (https://github.com/matrix-org/synapse/issues/4431). | ||||
* | | | | | | | | Fixup removal of duplicate `user_ips` rows (#4432) | Erik Johnston | 2019-01-23 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unnecessary ORDER BY clause * Add logging * Newsfile | ||||
* | | | | | | | | Support ACME for certificate provisioning (#4384) | Amber Brown | 2019-01-23 | 8 | -36/+298 |
| | | | | | | | | |||||
| | | | * | | | | Merge branch 'erikj/msc_1813' into erikj/require_format_version | Erik Johnston | 2019-01-23 | 5 | -8/+41 |
| | | |/| | | | | | | | |/ / / | |||||
| | | | * | | | Newsfile | Erik Johnston | 2019-01-23 | 1 | -0/+1 |
| | | | | | | | |||||
| | | | * | | | Implement MSC 1813 - Add room version to make APIs | Erik Johnston | 2019-01-23 | 4 | -8/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also implement `make_membership_event` converting the returned room version to an event format version. | ||||
| | | * | | | | Update newsfile | Erik Johnston | 2019-01-23 | 1 | -1/+1 |
| | | |/ / / | |||||
| | | * | | | isort | Erik Johnston | 2019-01-23 | 2 | -4/+2 |
| | | | | | | |||||
| | | * | | | Newsfile | Erik Johnston | 2019-01-23 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | Add support for persisting event format versions | Erik Johnston | 2019-01-23 | 5 | -4/+50 |
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we only have the one event format version defined, but this adds the necessary infrastructure to persist and fetch the format versions alongside the events. We specify the format version rather than the room version as: 1. We don't necessarily know the room version, existing events may be either v1 or v2. 2. We'd need to be careful to prevent/handle correctly if different events in the same room reported to be of different versions, which sounds annoying. | ||||
* | | | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedup | Erik Johnston | 2019-01-22 | 2 | -26/+36 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix bug when removing duplicate rows from user_ips | ||||
| * | | | | Refactor to rewrite the SQL instead | Erik Johnston | 2019-01-22 | 1 | -13/+16 |
| | | | | | |||||
| * | | | | Don't shadow params | Erik Johnston | 2019-01-22 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Newsfile | Erik Johnston | 2019-01-22 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix bug when removing duplicate rows from user_ips | Erik Johnston | 2019-01-22 | 1 | -13/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by accidentally overwritting a `last_seen` variable in a for loop, causing the wrong value to be written to the progress table. The result of which was that we didn't scan sections of the table when searching for duplicates, and so some duplicates did not get deleted. | ||||
* | | | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registration | Neil Johnson | 2019-01-22 | 3 | -11/+15 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Config option to disable requesting MSISDN on registration | ||||
| * | | | | fix line length | Neil Johnson | 2019-01-21 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Config option to disable requesting MSISDN on registration | Neil Johnson | 2019-01-21 | 3 | -11/+13 |
| | | | | | |||||
| | | | * | Move tag and direct state copying into separate function | Andrew Morgan | 2019-01-25 | 1 | -43/+63 |
| | | | | | |||||
| | | | * | lint | Andrew Morgan | 2019-01-22 | 1 | -1/+3 |
| | | | | | |||||
| | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-01-22 | 3 | -172/+8 |
| | | | |\ | |_|_|_|/ |/| | | | | | | | | | anoa/dm_room_upgrade | ||||
* | | | | | Make key fetches use regular federation client (#4426) | Richard van der Hoff | 2019-01-22 | 3 | -172/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | All this magic is redundant. | ||||
| | | | * | Prevent duplicate room IDs in m.direct | Andrew Morgan | 2019-01-22 | 1 | -10/+9 |
| | | | | | |||||
| | | | * | Fix comments | Andrew Morgan | 2019-01-22 | 1 | -2/+2 |
| | | | | | |||||
| | | | * | Join logic covers both room creator and arbitrary users | Andrew Morgan | 2019-01-22 | 1 | -33/+0 |
| | | | | | |||||
| | | | * | tags, m.direct copying over correctly | Andrew Morgan | 2019-01-22 | 2 | -11/+62 |
| | | | | | |||||
| | | | * | Fix typos | Andrew Morgan | 2019-01-22 | 4 | -14/+14 |
| | | | | | |||||
| | | | * | Migrating dm and room tags work for migrator | Andrew Morgan | 2019-01-22 | 1 | -2/+13 |
| | | | | | |||||
| | | | * | Prevent crash on user who doesn't have any direct rooms | Andrew Morgan | 2019-01-22 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Add changelog | Andrew Morgan | 2019-01-22 | 1 | -0/+1 |
| | | | | | |||||
| | | | * | Preserve DM status of a room on upgrade | Andrew Morgan | 2019-01-22 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> | ||||
| | | | * | Fix typo | Andrew Morgan | 2019-01-22 | 1 | -2/+2 |
| |_|_|/ |/| | | | |||||
* | | | | Refactor and bugfix for resove_service (#4427) | Richard van der Hoff | 2019-01-22 | 6 | -86/+250 |
| | | | | |||||
* | | | | Require ECDH key exchange & remove dh_params (#4429) | Amber Brown | 2019-01-22 | 8 | -57/+6 |
| |/ / |/| | | | | | * remove dh_params and set better cipher string | ||||
* | | | Merge pull request #4402 from matrix-org/erikj/fed_v2_invite_server | Erik Johnston | 2019-01-21 | 4 | -6/+42 |
|\ \ \ | |/ / |/| | | Implement server side of MSC1794 - Federation v2 Invite API | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-21 | 24 | -118/+261 |
| |\ \ | |/ / |/| | | | | | erikj/fed_v2_invite_server | ||||
* | | | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis | Erik Johnston | 2019-01-21 | 4 | -68/+74 |
|\ \ \ | | | | | | | | | Add groundwork for new versions of federation APIs | ||||
* | | | | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 3 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Migrate encryption state on room upgrade Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> * Add changelog file | ||||
* | | | | Fix race when persisting create event (#4404) | Erik Johnston | 2019-01-18 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix race when persisting create event When persisting a chunk of DAG it is sometimes requried to do a state resolution, which requires knowledge of the room version. If this happens while we're persisting the create event then we need to use that event rather than attempting to look it up in the database. | ||||
* | | | | Tweak code coverage settings (#4400) | Erik Johnston | 2019-01-18 | 3 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Tweak code coverage settings * Fix manifest * Newsfile * Fix commit status? | ||||
* | | | | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 4 | -93/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant WrappedConnection The matrix federation client uses an HTTP connection pool, which times out its idle HTTP connections, so there is no need for any of this business. | ||||
* | | | | Fix incorrect logcontexts after a Deferred was cancelled (#4407) | Richard van der Hoff | 2019-01-17 | 4 | -3/+117 |
| |_|/ |/| | | |||||
* | | | sign_request -> build_auth_headers (#4408) | Richard van der Hoff | 2019-01-17 | 3 | -15/+18 |
| | | | | | | | | | | | | | | | Just got very confused about the fact that the headers are only an output, not an input. | ||||
* | | | Changing macaroon_secret_key no longer logs you out (#4387) | Richard van der Hoff | 2019-01-16 | 2 | -3/+1 |
| | | | |||||
* | | | don't store more remote device lists if they have more than 1K devices (#4397) | Richard van der Hoff | 2019-01-16 | 2 | -0/+20 |
| | | | |||||
* | | | Merge pull request #4399 from andrewshadura/update-python-deps | Erik Johnston | 2019-01-16 | 2 | -2/+3 |
|\ \ \ | | | | | | | | | Update Dependencies | ||||
| * | | | Add a changelog entry | Andrej Shadura | 2019-01-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk> | ||||
| * | | | Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynacl | Andrej Shadura | 2019-01-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 0.13.0, pymacaroons works correctly with pynacl, so there isn’t any more reason to depend on an outdated pynacl fork. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk> | ||||
| * | | | Use msgpack instead of msgpack-python | Andrej Shadura | 2019-01-16 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | | | | The package msgpack-python has been deprecated. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk> | ||||
* | | | Merge pull request #4392 from matrix-org/neilj/fix_user_type_typo | Erik Johnston | 2019-01-15 | 2 | -1/+2 |
|\ \ \ | | | | | | | | | ALL_USER_TYPES should be a tuple | ||||
| * | | | ALL_USER_TYPES should be a tuple | Neil Johnson | 2019-01-15 | 2 | -1/+2 |
|/ / / | |||||
| | * | Newsfile | Erik Johnston | 2019-01-16 | 1 | -0/+1 |
| | | | |||||
| | * | Add /v2/invite federation API | Erik Johnston | 2019-01-15 | 3 | -6/+41 |
| |/ | |||||
| * | Newsfile | Erik Johnston | 2019-01-15 | 1 | -0/+1 |
| | | |||||
| * | Add groundwork for new versions of federation APIs | Erik Johnston | 2019-01-15 | 3 | -68/+73 |
|/ | |||||
* | Merge branch 'release-v0.34.1.1' into develop | Richard van der Hoff | 2019-01-12 | 4 | -49/+163 |
|\ | |||||
| * | moar plusses! | Richard van der Hoff | 2019-01-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turns out that 0.34.1.1+1 comes before 0.34.1.1+bionic (etc). The version may only contain "~ 0-9 A-Z a-z + - ." (sorting in that order). Option 1: replace "+" with something that sorts after +. Options are "-" (but dpkg-source complains about that) or "." (but that would mean we couldn't distinguish packaging-only changes from real changes). Option 2: stick with + and just find something that sorts after 'xenial'. The only options there are "-", "." (same problems as before), "z", and "+". Hence, ++1. Sorry. | ||||
| * | Rewrite build_debian_packages github/release-v0.34.1.1 release-v0.34.1.1 | Richard van der Hoff | 2019-01-12 | 2 | -46/+154 |
| | | | | | | | | Rewrite this in python so that it can be run in parallel. | ||||
| * | s/Breaks/Conflicts/ in debian/control | Richard van der Hoff | 2019-01-11 | 2 | -3/+9 |
| | | | | | | | | Otherwise people can't upgrade from matrix-synapse without removing it first | ||||
* | | Silence travis-ci build warnings by removing non-functional python3.6 (#4377) | Richard van der Hoff | 2019-01-12 | 2 | -0/+8 |
| | | | | | | | | | | | | * Remove non-functional python3.6 in travis env * changelog | ||||
* | | Remove duplicates in the user_ips table and add an index (#4370) | Amber Brown | 2019-01-12 | 4 | -4/+164 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | Amber Brown | 2019-01-11 | 6 | -195/+51 |
|\ \ | |||||
| * | | Merge Synapse v0.34.1.1 | Amber Brown | 2019-01-11 | 6 | -195/+51 |
| |\| | |||||
| | * | changelog, for debian | Amber Brown | 2019-01-11 | 1 | -0/+6 |
| | | | |||||
| | * | changelog v0.34.1.1 | Amber Brown | 2019-01-11 | 2 | -1/+14 |
| | | | |||||
| | * | version | Amber Brown | 2019-01-11 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #4374 from matrix-org/rav/macaroon_key_fix_0.34.1 | Amber Brown | 2019-01-11 | 4 | -194/+31 |
| |/| | | | | | | | Fix spontaneous logout | ||||
| | * | changelog | Richard van der Hoff | 2019-01-10 | 2 | -1/+1 |
| | | | |||||
| | * | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 | Richard van der Hoff | 2019-01-10 | 4 | -194/+31 |
| |/| | | | | | | | | | | Fixes #4371 |