| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | | | | | | | MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -0/+147 |
* | | | | | | | | debian package: symlink to python-3.X (#4433) | Richard van der Hoff | 2019-01-23 | 3 | -2/+16 |
* | | | | | | | | Fixup removal of duplicate `user_ips` rows (#4432) | Erik Johnston | 2019-01-23 | 2 | -1/+6 |
* | | | | | | | | 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 |
| | | * | | | | 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 |
| |_|/ / /
|/| | | | |
|
* | | | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedup | Erik Johnston | 2019-01-22 | 2 | -26/+36 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | 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 |
* | | | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registration | Neil Johnson | 2019-01-22 | 3 | -11/+15 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | 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 anoa/dm_room_upg... | Andrew Morgan | 2019-01-22 | 3 | -172/+8 |
| | | | |\
| |_|_|_|/
|/| | | | |
|
* | | | | | Make key fetches use regular federation client (#4426) | Richard van der Hoff | 2019-01-22 | 3 | -172/+8 |
| | | | * | 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 |
| | | | * | 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 |
| |/ /
|/| | |
|
* | | | Merge pull request #4402 from matrix-org/erikj/fed_v2_invite_server | Erik Johnston | 2019-01-21 | 4 | -6/+42 |
|\ \ \
| |/ /
|/| | |
|
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv... | Erik Johnston | 2019-01-21 | 24 | -118/+261 |
| |\ \
| |/ /
|/| | |
|
* | | | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis | Erik Johnston | 2019-01-21 | 4 | -68/+74 |
|\ \ \ |
|
* | | | | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 3 | -0/+3 |
* | | | | Fix race when persisting create event (#4404) | Erik Johnston | 2019-01-18 | 2 | -1/+13 |
* | | | | Tweak code coverage settings (#4400) | Erik Johnston | 2019-01-18 | 3 | -0/+17 |
* | | | | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 4 | -93/+67 |
* | | | | 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 |
* | | | 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 |
|\ \ \ |
|
| * | | | Add a changelog entry | Andrej Shadura | 2019-01-16 | 1 | -0/+1 |
| * | | | 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 |
|/ / / |
|
* | | | 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 | 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 |
| * | 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 |
| * | s/Breaks/Conflicts/ in debian/control | Richard van der Hoff | 2019-01-11 | 2 | -3/+9 |
* | | Silence travis-ci build warnings by removing non-functional python3.6 (#4377) | Richard van der Hoff | 2019-01-12 | 2 | -0/+8 |
* | | 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 |
| |/| |
|
| | * | 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 |
| |/| |
|
| | * | Revert "Fix macaroon_secret_key fallback logic" | Richard van der Hoff | 2019-01-10 | 1 | -3/+3 |
| | * | changelog | Richard van der Hoff | 2019-01-10 | 1 | -0/+1 |
| | * | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 | Richard van der Hoff | 2019-01-10 | 3 | -197/+33 |
| | |\ |
|
| | | * | 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 | 2 | -186/+28 |
| | | * | Fix fallback to signing key for macaroon-secret-key | Richard van der Hoff | 2019-01-10 | 1 | -2/+2 |
* | | | | Merge pull request #4342 from aaronraimist/new-virtualenv | Richard van der Hoff | 2019-01-10 | 2 | -3/+3 |
|\ \ \ \ |
|
| * | | | | README.rst: fix hash_password path | Richard van der Hoff | 2019-01-02 | 1 | -2/+1 |
| * | | | | Add changelog | Aaron Raimist | 2019-01-01 | 1 | -0/+1 |
| * | | | | Update README to use new virtualenv (#4328) | Aaron Raimist | 2019-01-01 | 1 | -2/+2 |
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-01-09 | 1 | -3/+1 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | fix docker build to install optional deps github/release-v0.34.1 release-v0.34.1 | Richard van der Hoff | 2019-01-09 | 1 | -3/+1 |
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-01-09 | 2 | -1/+8 |
|\| | | | |
|
| * | | | | debian: Remove Breaks: matrix-synapse-ldap3 v0.34.1+1 | Richard van der Hoff | 2019-01-09 | 2 | -1/+8 |
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-01-09 | 45 | -46/+73 |
|\| | | | |
|
| * | | | | 0.34.1 v0.34.1 | Richard van der Hoff | 2019-01-09 | 5 | -5/+13 |
| * | | | | Merge branch 'develop' into release-v0.34.1 | Erik Johnston | 2019-01-09 | 4 | -6/+13 |
| |\ \ \ \ |
|
| * | | | | | clean up changelog v0.34.1rc1 | Richard van der Hoff | 2019-01-08 | 1 | -3/+2 |
| * | | | | | 0.34.1rc1 | Richard van der Hoff | 2019-01-08 | 1 | -1/+1 |
| * | | | | | changelog | Richard van der Hoff | 2019-01-08 | 41 | -41/+61 |
* | | | | | | Merge pull request #4368 from matrix-org/erikj/better_errors | Erik Johnston | 2019-01-09 | 2 | -68/+74 |
|\ \ \ \ \ \ |
|
| * | | | | | | Newsfile | Erik Johnston | 2019-01-09 | 1 | -0/+1 |
| * | | | | | | 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 | 3 | -1/+81 |
| |_|/ / / /
|/| | | | | |
|
* | | | | | | Merge pull request #4362 from matrix-org/erikj/better_errors | Erik Johnston | 2019-01-09 | 2 | -5/+6 |
|\| | | | | |
|
| * | | | | | Newsfile | Erik Johnston | 2019-01-08 | 1 | -0/+1 |
| * | | | | | Use RequestSendFailed when fail to parse content type headers | Erik Johnston | 2019-01-08 | 1 | -5/+5 |
* | | | | | | Merge pull request #4361 from matrix-org/erikj/better_errors | Erik Johnston | 2019-01-08 | 2 | -1/+7 |
|\| | | | |
| |/ / / /
|/| | | | |
|
| * | | | | Newsfile | Erik Johnston | 2019-01-08 | 1 | -0/+1 |
| * | | | | 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 | 6 | -44/+119 |
* | | | | Fix synapse.config.__main__ on python 3 (#4356) | Amber Brown | 2019-01-08 | 2 | -1/+2 |
* | | | | Fix command hint to generate a config file (#4353) | Jason Robinson | 2019-01-07 | 3 | -2/+8 |
* | | | | Add GET account data routes (#4303) | Travis Ralston | 2019-01-07 | 2 | -1/+34 |
* | | | | Check jinja version for consent resource (#4327) | Richard van der Hoff | 2019-01-07 | 4 | -28/+75 |
* | | | | fix the check for whether `is_url` to match all the other ones in codebase (#... | Michael Telatynski | 2019-01-06 | 2 | -3/+9 |
* | | | | Update debian Conflicts specifications (#4349) | Richard van der Hoff | 2019-01-04 | 3 | -2/+14 |
* | | | | fix NPE in /messages by checking if all events were filtered out (#4330) | Matthew Hodgson | 2019-01-02 | 2 | -10/+12 |
* | | | | Update README to not lie about required restart (#4343) | Aaron Raimist | 2019-01-02 | 2 | -2/+3 |
* | | | | Merge pull request #4344 from matrix-org/neilj/fix_synchrotron_fix_4312 | Neil Johnson | 2019-01-02 | 2 | -25/+26 |
|\ \ \ \ |
|
| * | | | | Ensure synchrotrons can access is_support_user in the storage layer | Neil Johnson | 2019-01-02 | 2 | -25/+26 |
|/ / / / |
|
* | | | | Update docker-compose.yml (#4282) | jribal | 2019-01-02 | 1 | -1/+1 |
* | | | | Update PR template to use absolute links (#4341) | Aaron Raimist | 2019-01-02 | 2 | -2/+3 |
* | | | | Avoid packaging _trial_temp directory (#4326) | Richard van der Hoff | 2019-01-02 | 2 | -2/+3 |
* | | | | Install the optional dependencies into the debian package (#4325) | Richard van der Hoff | 2019-01-02 | 5 | -20/+37 |
|/ / / |
|
* | | | Remove v1 only REST APIs now we don't ship matrix console (#4334) | Amber Brown | 2018-12-29 | 7 | -590/+45 |
* | | | Remove mention of lt-cred-mech in the sample coturn config. (#4333) | Krithin Sitaram | 2018-12-28 | 2 | -3/+3 |
* | | | Log roomid along with Unknown room (#4297) | Will Hunt | 2018-12-24 | 2 | -1/+2 |
* | | | Merge pull request #4307 from matrix-org/erikj/v2_rooms | Richard van der Hoff | 2018-12-24 | 3 | -1/+6 |
|\ \ \ |
|
| * | | | Newsfile | Erik Johnston | 2018-12-18 | 1 | -0/+1 |
| * | | | 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 | 3 | -7/+15 |
* | | | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5 | Richard van der Hoff | 2018-12-23 | 2 | -1/+24 |
|\ \ \ \ |
|
| * | | | | Fix test_metrics.py compatibility prometheus_client 0.5 | Maarten de Vries | 2018-12-21 | 2 | -1/+24 |
* | | | | | Merge pull request #4316 from matrix-org/rav/fix_docker_upload | Richard van der Hoff | 2018-12-21 | 2 | -2/+3 |
|\ \ \ \ \ |
|
| * | | | | | Fix circleci config for synapse:latest docker upload | Richard van der Hoff | 2018-12-21 | 2 | -2/+3 |
| |/ / / / |
|
* | | | | | Add a script to generate a clean config file (#4315) | Richard van der Hoff | 2018-12-22 | 11 | -46/+157 |
* | | | | | Fix indentation in default config (#4313) | Richard van der Hoff | 2018-12-22 | 2 | -35/+36 |
* | | | | | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 8 | -272/+590 |
* | | | | | Make the dependencies more like a standard Python project and hook up the opt... | Amber Brown | 2018-12-22 | 7 | -158/+111 |
|/ / / / |
|