Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release-v0.99.0' into develop | Richard van der Hoff | 2019-01-31 | 3 | -8/+44 |
|\ | |||||
| * | v0.99.0rc3 v0.99.0rc3 | Richard van der Hoff | 2019-01-31 | 1 | -1/+1 |
| * | Add some debug for membership syncing issues (#4538) | Richard van der Hoff | 2019-01-31 | 1 | -2/+11 |
| * | Fix infinite loop when an event is redacted in a v3 room (#4535) | Richard van der Hoff | 2019-01-31 | 1 | -5/+32 |
* | | Reject large transactions on federation (#4513) | Andrew Morgan | 2019-01-31 | 1 | -0/+16 |
* | | Merge remote-tracking branch 'origin/release-v0.99.0' into develop | Richard van der Hoff | 2019-01-30 | 2 | -2/+2 |
|\| | |||||
| * | v0.99.0rc2 v0.99.0rc2 | Richard van der Hoff | 2019-01-30 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'origin/develop' into release-v0.99.0 | Richard van der Hoff | 2019-01-30 | 1 | -1/+13 |
| |\ | |||||
| * | | Update constants.py | Neil Johnson | 2019-01-30 | 1 | -1/+1 |
| * | | 0.99.0rc1 v0.99.0rc1 | Richard van der Hoff | 2019-01-30 | 1 | -1/+1 |
* | | | by default include m.room.encryption on invites (#3902) | Matthew Hodgson | 2019-01-30 | 2 | -0/+3 |
| |/ |/| | |||||
* | | 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 | 3 | -0/+74 |
|\ | |||||
| * | Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ... | Neil Johnson | 2019-01-30 | 53 | -542/+1641 |
| |\ | |||||
| | * | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 53 | -542/+1641 |
| | |\ | |||||
| * | | | 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 | 1 | -1/+3 |
| * | | support change_password in capabilities end-point | Neil Johnson | 2019-01-29 | 1 | -2/+12 |
| * | | enforce auth for capabilities endpoint | Neil Johnson | 2019-01-29 | 1 | -10/+17 |
| * | | 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 | 1 | -0/+49 |
| * | | track unstable room v3 | Neil Johnson | 2019-01-25 | 1 | -0/+2 |
* | | | Fix replication for room v3 (#4523) | Erik Johnston | 2019-01-30 | 1 | -1/+4 |
* | | | ACME config cleanups (#4525) | Richard van der Hoff | 2019-01-30 | 4 | -60/+114 |
* | | | Raise ConfigError instead | Erik Johnston | 2019-01-30 | 1 | -1/+3 |
* | | | _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 | 1 | -9/+11 |
|\ \ \ | |||||
| * | | | 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 | 1 | -2/+4 |
* | | | | SIGHUP for TLS cert reloading (#4495) | Amber Brown | 2019-01-30 | 3 | -20/+79 |
|/ / / | |||||
* | | | Add a caching layer to .well-known responses (#4516) | Richard van der Hoff | 2019-01-30 | 2 | -2/+249 |
* | | | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 7 | -92/+92 |
| |/ |/| | |||||
* | | Merge pull request #4486 from xperimental/workaround-4216 | Richard van der Hoff | 2019-01-30 | 1 | -1/+4 |
|\ \ | |||||
| * | | Implement workaround for login error. | Robert Jacob | 2019-01-30 | 1 | -1/+4 |
* | | | No vdh tests! | Erik Johnston | 2019-01-29 | 1 | -2/+1 |
* | | | Enable room version v3 | Erik Johnston | 2019-01-29 | 4 | -4/+14 |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions... | Erik Johnston | 2019-01-29 | 8 | -46/+76 |
|\ \ \ | |||||
| * \ \ | Merge pull request #4514 from matrix-org/erikj/remove_event_id | Erik Johnston | 2019-01-29 | 8 | -47/+82 |
| |\ \ \ | |||||
| | * | | | 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 |
| | * | | | 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 | 17 | -208/+503 |
|\| | | | | |||||
| * | | | | Merge pull request #4483 from matrix-org/erikj/event_v2 | Erik Johnston | 2019-01-29 | 4 | -19/+108 |
| |\ \ \ \ | |||||
| | * | | | | 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 | 2 | -11/+14 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | 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 | 1 | -20/+13 |
| * | | | | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurl | Travis Ralston | 2019-01-29 | 1 | -1/+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 | 1 | -43/+18 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #4481 from matrix-org/erikj/event_builder | Erik Johnston | 2019-01-29 | 7 | -133/+260 |
| |\ \ \ \ | |||||
| | * | | | | 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 |
| | * | | | | Replace usage of builder.user_id with builder.sender | Erik Johnston | 2019-01-29 | 1 | -1/+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 | 1 | -10/+6 |
| * | | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489) | Richard van der Hoff | 2019-01-29 | 1 | -4/+110 |
| * | | | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signature | Erik Johnston | 2019-01-29 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixup calls to `comput_event_signature` | Erik Johnston | 2019-01-29 | 2 | -2/+2 |
* | | | | | | | 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 |
* | | | | | | | 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 | 2 | -14/+89 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Implement fallback for V2 invite API | Erik Johnston | 2019-01-28 | 2 | -14/+89 |
* | | | | | | Make linearizer more quiet (#4507) | Amber Brown | 2019-01-29 | 1 | -5/+5 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validator | Erik Johnston | 2019-01-29 | 3 | -26/+45 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
| * | | | | | 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 | 1 | -1/+1 |
* | | | | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signing | Erik Johnston | 2019-01-29 | 2 | -42/+104 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor event signing to work on dicts | Erik Johnston | 2019-01-28 | 2 | -42/+104 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_version | Erik Johnston | 2019-01-28 | 8 | -25/+56 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Correctly use default room version if none is set | Erik Johnston | 2019-01-28 | 1 | -2/+2 |
| * | | | | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 8 | -24/+55 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fix worker TLS (#4492) | Amber Brown | 2019-01-28 | 7 | -48/+48 |
| |/ / / |/| | | | |||||
* | | | | Fix UPSERTs on SQLite 3.24+ (#4477) | Amber Brown | 2019-01-28 | 3 | -12/+20 |
* | | | | 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 | 15 | -107/+342 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | docstrings for _RoutingResult | Richard van der Hoff | 2019-01-28 | 1 | -0/+36 |
| * | | | Handle IP literals explicitly | Richard van der Hoff | 2019-01-28 | 1 | -0/+19 |
| * | | | 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 | 1 | -11/+12 |
| |/ / | |||||
| * | | Merge pull request #4470 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 11 | -82/+205 |
| |\ \ | |||||
| | * | | Replace missed usages of FrozenEvent | Erik Johnston | 2019-01-25 | 3 | -10/+14 |
| | * | | Require event format version to parse or create events | Erik Johnston | 2019-01-25 | 8 | -72/+191 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_nat... | Erik Johnston | 2019-01-25 | 7 | -6/+99 |
| |\ \ \ | |||||
| | * | | | Fix quoting for allowed_local_3pids example config (#4476) | Richard van der Hoff | 2019-01-25 | 1 | -3/+3 |
| | * | | | Fix Host header sent by MatrixFederationAgent (#4468) | Richard van der Hoff | 2019-01-25 | 2 | -1/+10 |
| | * | | | Don't require sqlite3 when using postgres (#4466) | Andrew Morgan | 2019-01-25 | 1 | -2/+1 |
| * | | | | 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 | 38 | -409/+1140 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms | Andrew Morgan | 2019-01-25 | 3 | -0/+85 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 |
| | * | | Search for messages across predecessor rooms | Andrew Morgan | 2019-01-18 | 3 | -0/+73 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813 | Erik Johnston | 2019-01-25 | 30 | -364/+920 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions | Erik Johnston | 2019-01-24 | 4 | -13/+66 |
| | |\ \ \ | |||||
| | | * | | | Review comments | Erik Johnston | 2019-01-24 | 2 | -1/+7 |
| | | * | | | Add room_version param to get_pdu | Erik Johnston | 2019-01-23 | 4 | -13/+60 |
| | * | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invites | Erik Johnston | 2019-01-24 | 4 | -39/+34 |
| | |\ \ \ \ | |||||
| | | * | | | | 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 |
| | | * | | | | Clarify the invite flows | Erik Johnston | 2019-01-23 | 3 | -7/+24 |
| | | * | | | | Remove unnecessary '_sign_event' | Erik Johnston | 2019-01-23 | 2 | -15/+8 |
| | | * | | | | Store rejected remote invite events as outliers | Erik Johnston | 2019-01-23 | 3 | -38/+21 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2 | Erik Johnston | 2019-01-24 | 5 | -4/+48 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fix | Andrew Morgan | 2019-01-24 | 1 | -2/+12 |
| | |\ \ \ \ | |||||
| | | * | | | | 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 |
| | | * | | | | 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 | 1 | -1/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Look up the right SRV record | Richard van der Hoff | 2019-01-24 | 1 | -1/+2 |
| | * | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460) | Richard van der Hoff | 2019-01-24 | 1 | -2/+3 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 3 | -8/+12 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | move guard out of is_threepid_reserved and into register.py | Neil Johnson | 2019-01-22 | 2 | -6/+5 |
| | | * | | | | | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 3 | -7/+12 |
| | * | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_doc | Neil Johnson | 2019-01-24 | 1 | -1/+5 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Clarify docs for public_baseurl | David Baker | 2019-01-24 | 1 | -1/+5 |
| | | | |/ / / / | | | |/| | | | | |||||
| | * / | | | | | Fix UPSERT check (#4459) | Amber Brown | 2019-01-24 | 1 | -5/+28 |
| | |/ / / / / | |||||
| | * | | | | | Use native UPSERTs where possible (#4306) | Amber Brown | 2019-01-24 | 7 | -30/+212 |
| | * | | | | | Don't send IP addresses as SNI (#4452) | Richard van der Hoff | 2019-01-24 | 1 | -3/+12 |
| | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backport | Andrew Morgan | 2019-01-23 | 1 | -0/+6 |
| | |\ \ \ \ | |||||
| | | * | | | | 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 | 4 | -232/+240 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | put resolve_service in an object | Richard van der Hoff | 2019-01-22 | 2 | -63/+86 |
| | | * | | | | Require that service_name be a byte string | Richard van der Hoff | 2019-01-22 | 1 | -4/+4 |
| | | * | | | | 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 | 1 | -27/+10 |
| | | * | | | | MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -0/+147 |
| | * | | | | | Fixup removal of duplicate `user_ips` rows (#4432) | Erik Johnston | 2019-01-23 | 1 | -1/+5 |
| | * | | | | | Support ACME for certificate provisioning (#4384) | Amber Brown | 2019-01-23 | 6 | -35/+296 |
| * | | | | | | Review comments | Erik Johnston | 2019-01-24 | 2 | -2/+4 |
| * | | | | | | Implement MSC 1813 - Add room version to make APIs | Erik Johnston | 2019-01-23 | 4 | -8/+40 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | isort | Erik Johnston | 2019-01-23 | 2 | -4/+2 |
| * | | | | | Add support for persisting event format versions | Erik Johnston | 2019-01-23 | 5 | -4/+50 |
| |/ / / / | |||||
| * | | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedup | Erik Johnston | 2019-01-22 | 1 | -26/+35 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | 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 |
| | * | | | Fix bug when removing duplicate rows from user_ips | Erik Johnston | 2019-01-22 | 1 | -13/+20 |
| * | | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registration | Neil Johnson | 2019-01-22 | 2 | -11/+14 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | fix line length | Neil Johnson | 2019-01-21 | 1 | -1/+3 |
| | * | | | Config option to disable requesting MSISDN on registration | Neil Johnson | 2019-01-21 | 2 | -11/+12 |
* | | | | | 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 anoa/dm_room_upg... | Andrew Morgan | 2019-01-22 | 2 | -172/+7 |
|\| | | | | |||||
| * | | | | Make key fetches use regular federation client (#4426) | Richard van der Hoff | 2019-01-22 | 2 | -172/+7 |
* | | | | | 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 | 3 | -13/+13 |
* | | | | | 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 |
* | | | | | Preserve DM status of a room on upgrade | Andrew Morgan | 2019-01-22 | 1 | -0/+19 |
* | | | | | Fix typo | Andrew Morgan | 2019-01-22 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Refactor and bugfix for resove_service (#4427) | Richard van der Hoff | 2019-01-22 | 3 | -72/+141 |
* | | | | Require ECDH key exchange & remove dh_params (#4429) | Amber Brown | 2019-01-22 | 2 | -42/+4 |
| |/ / |/| | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv... | Erik Johnston | 2019-01-21 | 10 | -111/+84 |
|\| | | |||||
| * | | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis | Erik Johnston | 2019-01-21 | 3 | -68/+73 |
| |\ \ | |||||
| * | | | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 2 | -0/+2 |
| * | | | Fix race when persisting create event (#4404) | Erik Johnston | 2019-01-18 | 1 | -1/+12 |
| * | | | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 2 | -86/+19 |
| * | | | Fix incorrect logcontexts after a Deferred was cancelled (#4407) | Richard van der Hoff | 2019-01-17 | 2 | -3/+12 |
| | |/ | |/| | |||||
| * | | sign_request -> build_auth_headers (#4408) | Richard van der Hoff | 2019-01-17 | 2 | -15/+17 |
| * | | Changing macaroon_secret_key no longer logs you out (#4387) | Richard van der Hoff | 2019-01-16 | 1 | -3/+0 |
| * | | don't store more remote device lists if they have more than 1K devices (#4397) | Richard van der Hoff | 2019-01-16 | 1 | -0/+19 |
| * | | Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynacl | Andrej Shadura | 2019-01-16 | 1 | -1/+1 |
| * | | Use msgpack instead of msgpack-python | Andrej Shadura | 2019-01-16 | 1 | -1/+1 |
| * | | ALL_USER_TYPES should be a tuple | Neil Johnson | 2019-01-15 | 1 | -1/+1 |
* | | | Add /v2/invite federation API | Erik Johnston | 2019-01-15 | 3 | -6/+41 |
| |/ |/| | |||||
* | | Add groundwork for new versions of federation APIs | Erik Johnston | 2019-01-15 | 3 | -68/+73 |
|/ | |||||
* | Remove duplicates in the user_ips table and add an index (#4370) | Amber Brown | 2019-01-12 | 2 | -4/+160 |
* | Merge remote-tracking branch 'origin/master' into develop | Amber Brown | 2019-01-11 | 3 | -41/+30 |
|\ | |||||
| * | version | Amber Brown | 2019-01-11 | 1 | -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 | 2 | -40/+29 |
| |\ | |||||
| | * | Revert "Fix macaroon_secret_key fallback logic" | Richard van der Hoff | 2019-01-10 | 1 | -3/+3 |
| | * | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 | Richard van der Hoff | 2019-01-10 | 2 | -43/+32 |
| | |\ | |||||
| | | * | Fix macaroon_secret_key fallback logic | Richard van der Hoff | 2019-01-10 | 1 | -3/+3 |
| | | * | Skip macaroon check for access tokens in the db | Richard van der Hoff | 2019-01-10 | 1 | -38/+27 |
| | | * | Fix fallback to signing key for macaroon-secret-key | Richard van der Hoff | 2019-01-10 | 1 | -2/+2 |
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-01-09 | 1 | -1/+1 |
|\| | | | |||||
| * | | | 0.34.1 v0.34.1 | Richard van der Hoff | 2019-01-09 | 1 | -1/+1 |
| * | | | Merge branch 'develop' into release-v0.34.1 | Erik Johnston | 2019-01-09 | 2 | -6/+11 |
| |\ \ \ | |||||
| * | | | | 0.34.1rc1 | Richard van der Hoff | 2019-01-08 | 1 | -1/+1 |
* | | | | | Merge pull request #4368 from matrix-org/erikj/better_errors | Erik Johnston | 2019-01-09 | 1 | -68/+73 |
|\ \ \ \ \ | |||||
| * | | | | | Fixup docstrings for matrixfederationclient | Erik Johnston | 2019-01-09 | 1 | -68/+73 |
| | |/ / / | |/| | | | |||||
* / | | | | Fix adding new rows instead of updating them if one of the key values is a NU... | Amber Brown | 2019-01-09 | 1 | -1/+9 |
|/ / / / | |||||
* | | | | Use RequestSendFailed when fail to parse content type headers | Erik Johnston | 2019-01-08 | 1 | -5/+5 |
* | | | | Don't log stack traces for HTTP error responses | Erik Johnston | 2019-01-08 | 1 | -1/+6 |
|/ / / | |||||
* | | | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 4 | -41/+108 |
* | | | Fix synapse.config.__main__ on python 3 (#4356) | Amber Brown | 2019-01-08 | 1 | -1/+1 |
* | | | Add GET account data routes (#4303) | Travis Ralston | 2019-01-07 | 1 | -1/+33 |
* | | | Check jinja version for consent resource (#4327) | Richard van der Hoff | 2019-01-07 | 3 | -28/+74 |
* | | | fix the check for whether `is_url` to match all the other ones in codebase (#... | Michael Telatynski | 2019-01-06 | 1 | -3/+8 |
* | | | fix NPE in /messages by checking if all events were filtered out (#4330) | Matthew Hodgson | 2019-01-02 | 1 | -10/+11 |
* | | | Ensure synchrotrons can access is_support_user in the storage layer | Neil Johnson | 2019-01-02 | 1 | -25/+25 |
* | | | Remove v1 only REST APIs now we don't ship matrix console (#4334) | Amber Brown | 2018-12-29 | 4 | -445/+0 |
* | | | Log roomid along with Unknown room (#4297) | Will Hunt | 2018-12-24 | 1 | -1/+1 |
* | | | Merge pull request #4307 from matrix-org/erikj/v2_rooms | Richard van der Hoff | 2018-12-24 | 2 | -1/+5 |
|\ \ \ | |||||
| * | | | Add v2 room version | Erik Johnston | 2018-12-18 | 2 | -1/+5 |
* | | | | Return well_known in /login response (#4319) | Richard van der Hoff | 2018-12-24 | 1 | -7/+11 |
* | | | | Add a script to generate a clean config file (#4315) | Richard van der Hoff | 2018-12-22 | 9 | -46/+89 |
* | | | | Fix indentation in default config (#4313) | Richard van der Hoff | 2018-12-22 | 1 | -35/+35 |
* | | | | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 3 | -171/+255 |
* | | | | Make the dependencies more like a standard Python project and hook up the opt... | Amber Brown | 2018-12-22 | 3 | -147/+90 |
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-12-20 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Prepare 0.34 release | Richard van der Hoff | 2018-12-20 | 1 | -1/+1 |
| * | | | Debian packaging via dh_virtualenv | Richard van der Hoff | 2018-12-20 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Debian packaging via dh_virtualenv (#4285) | Richard van der Hoff | 2018-12-20 | 2 | -2/+2 |
| * | | | | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-20 | 1 | -1/+2 |
| * | | | | Improved welcome page (#4294) | Nad Chishtie | 2018-12-14 | 1 | -25/+62 |