summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* NewsfileErik Johnston2019-01-291-0/+1
* Enable room version v3Erik Johnston2019-01-294-4/+14
* Merge pull request #4499 from matrix-org/erikj/redactions_eiahErik Johnston2019-01-298-16/+77
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-299-46/+77
| |\ | |/ |/|
* | Merge pull request #4514 from matrix-org/erikj/remove_event_idErik Johnston2019-01-299-47/+83
|\ \
| * | Update commentErik Johnston2019-01-291-3/+3
| * | check event format version not room versionErik Johnston2019-01-291-2/+2
| * | NewsfileErik Johnston2019-01-291-0/+1
| * | Don't assert an event must have an event IDErik Johnston2019-01-291-2/+3
| * | Only check event ID domain for signatures for V1 eventsErik Johnston2019-01-293-31/+44
| * | Use event origin for filtering incoming eventsErik Johnston2019-01-291-4/+7
| * | Use snder and not event ID domain to check if oursErik Johnston2019-01-292-1/+9
| * | Remove event ID usage when checking if new roomErik Johnston2019-01-291-1/+2
| * | Only check event IDs domain signed event for V1 and V2Erik Johnston2019-01-291-5/+14
| | * Fixup commentErik Johnston2019-01-291-2/+2
| | * kill vdh test some moreErik Johnston2019-01-291-2/+1
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-2954-288/+1051
| | |\ | |_|/ |/| |
* | | Merge pull request #4483 from matrix-org/erikj/event_v2Erik Johnston2019-01-295-19/+109
|\ \ \
| * | | NewsfileErik Johnston2019-01-291-0/+1
| * | | Implement event format v2Erik Johnston2019-01-294-19/+108
* | | | Merge pull request #4512 from matrix-org/anoa/consent_dirAndrew Morgan2019-01-293-11/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Add changelogAndrew Morgan2019-01-291-0/+1
| * | | Check consent dir path on startupAndrew Morgan2019-01-292-11/+14
* | | | Relax requirement for a content-type on .well-known (#4511)Richard van der Hoff2019-01-293-21/+14
* | | | Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurlTravis Ralston2019-01-292-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Create 4498.miscTravis Ralston2019-01-281-0/+1
| * | | Don't recommend :8448 to people on public_baseurlTravis Ralston2019-01-281-1/+1
* | | | Do not generate self-signed TLS certificates by default. (#4509)Amber Brown2019-01-294-45/+94
| |/ / |/| |
* | | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-2910-164/+288
|\ \ \
| * | | Correctly set context.app_serviceErik Johnston2019-01-291-0/+2
| * | | Don't set event_id twiceErik Johnston2019-01-291-2/+0
| * | | Remove dead functionErik Johnston2019-01-291-11/+0
| * | | Fix test to use valid event formatErik Johnston2019-01-291-1/+1
| * | | Replace usage of builder.user_id with builder.senderErik Johnston2019-01-291-1/+1
| * | | NewsfileErik Johnston2019-01-291-0/+1
| * | | Refactor event building into EventBuilderErik Johnston2019-01-295-112/+254
| * | | Make add_hashes_and_signatures operate on dictsErik Johnston2019-01-292-40/+32
* | | | Implement MSC1708 (.well-known lookups for server routing) (#4489)Richard van der Hoff2019-01-2923-21/+470
* | | | Merge pull request #4510 from matrix-org/erikj/fixup_compute_event_signatureErik Johnston2019-01-293-2/+3
|\ \ \ \
| * | | | NewsfileErik Johnston2019-01-291-0/+1
| * | | | Fixup calls to `comput_event_signature`Erik Johnston2019-01-292-2/+2
* | | | | Enable configuring test log level via env var (#4506)Richard van der Hoff2019-01-294-30/+80
| | | | * Update synapse/storage/events_worker.pyErik Johnston2019-01-291-1/+1
| | | | * Check redaction state when event is pulled out of the databaseErik Johnston2019-01-291-0/+13
| | | | * Fix typoErik Johnston2019-01-291-1/+1
| | | | * Remove unused argErik Johnston2019-01-291-2/+1
| | | | * Drop vdh supportErik Johnston2019-01-294-6/+2
| | | | * Add docstringErik Johnston2019-01-291-0/+12
| | | | * Update synapse/storage/events_worker.pyRichard van der Hoff2019-01-291-1/+1
| | | | * Finish comment...Erik Johnston2019-01-291-1/+1
| | | | * NewsfileErik Johnston2019-01-291-0/+1
| | | | * Implement rechecking of redactionsErik Johnston2019-01-295-10/+53
| | | | * Add RoomVersions.V3 constant, without enabling itErik Johnston2019-01-291-0/+1
| |_|_|/ |/| | |
* | | | Merge pull request #4496 from matrix-org/erikj/invite_fallbackErik Johnston2019-01-293-14/+90
|\ \ \ \ | |/ / / |/| | |
| * | | NewsfileErik Johnston2019-01-281-0/+1
| * | | Implement fallback for V2 invite APIErik Johnston2019-01-282-14/+89
* | | | Make linearizer more quiet (#4507)Amber Brown2019-01-292-5/+6
| |/ / |/| |
* | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validatorErik Johnston2019-01-294-26/+46
|\ \ \
| * | | Remove duplicate checksErik Johnston2019-01-291-14/+0
| * | | Fix up error messagesErik Johnston2019-01-291-2/+2
| * | | Fold validate into validate_newErik Johnston2019-01-291-16/+11
| * | | NewsfileErik Johnston2019-01-281-0/+1
| * | | Split up event validation between event and builderErik Johnston2019-01-283-23/+61
* | | | Fix receiving events from federation via a workerErik Johnston2019-01-291-1/+1
* | | | Fix typo in upserts code (#4505)Amber Brown2019-01-292-1/+2
* | | | Merge pull request #4493 from matrix-org/erikj/refactor_event_signingErik Johnston2019-01-293-42/+105
|\ \ \ \
| * | | | NewsfileErik Johnston2019-01-281-0/+1
| * | | | Refactor event signing to work on dictsErik Johnston2019-01-282-42/+104
| |/ / /
* | | | Use SimpleResolverComplexifier in tests (#4497)Richard van der Hoff2019-01-293-32/+17
* | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-2811-28/+71
|\ \ \ \ | |_|_|/ |/| | |
| * | | Correctly use default room version if none is setErik Johnston2019-01-281-2/+2
| * | | NewsfileErik Johnston2019-01-251-0/+1
| * | | Pass through room version to event authErik Johnston2019-01-2510-27/+69
* | | | Fix worker TLS (#4492)Amber Brown2019-01-288-48/+49
| |/ / |/| |
* | | Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-288-18/+30
* | | Merge pull request #4412 from matrix-org/anoa/dm_room_upgradeAndrew Morgan2019-01-285-18/+83
|\ \ \ | |_|/ |/| |
| * | Change return syntax in doc stringAndrew Morgan2019-01-281-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-2832-123/+556
| |\ \ | |/ / |/| |
* | | Remove --process-dependency-links from UPGRADE.rst (#4485)Aaron Raimist2019-01-282-1/+2
* | | Merge pull request #4488 from matrix-org/rav/fed_routing/refactorRichard van der Hoff2019-01-283-35/+120
|\ \ \
| * | | docstrings for _RoutingResultRichard van der Hoff2019-01-281-0/+36
| * | | changelogRichard van der Hoff2019-01-281-0/+1
| * | | Handle IP literals explicitlyRichard van der Hoff2019-01-282-17/+21
| * | | MatrixFederationAgent: factor out routing logicRichard van der Hoff2019-01-281-18/+62
|/ / /
* | / Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)Richard van der Hoff2019-01-283-12/+193
| |/ |/|
* | Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-2517-86/+220
|\ \
| * | NewsfileErik Johnston2019-01-251-0/+1
| * | Replace missed usages of FrozenEventErik Johnston2019-01-253-10/+14
| * | Fix testsErik Johnston2019-01-255-4/+14
| * | Require event format version to parse or create eventsErik Johnston2019-01-258-72/+191
* | | Merge pull request #4471 from matrix-org/erikj/sqlite_native_upsertErik Johnston2019-01-253-4/+9
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_nat...Erik Johnston2019-01-2513-7/+120
| |\ \ \ | |/ / / |/| | |
* | | | Fix quoting for allowed_local_3pids example config (#4476)Richard van der Hoff2019-01-252-3/+4
* | | | Fix Host header sent by MatrixFederationAgent (#4468)Richard van der Hoff2019-01-255-2/+28
* | | | Don't require sqlite3 when using postgres (#4466)Andrew Morgan2019-01-252-2/+2
| * | | NewsfileErik Johnston2019-01-252-1/+2
| * | | Disable native upserts for sqlite, as they don't workErik Johnston2019-01-251-3/+7
| |/ /
| | * Reuse predecessor methodAndrew Morgan2019-01-281-12/+8
| | * FixesAndrew Morgan2019-01-251-39/+39
| | * Clean up direct_rooms accessAndrew Morgan2019-01-251-3/+3
| | * Use python magicAndrew Morgan2019-01-251-2/+1
| | * Destructure account data tuple before useAndrew Morgan2019-01-251-3/+3
| | * Remove unnecessary null checkAndrew Morgan2019-01-251-7/+6
| | * Move room_tag declaration to be closer to its useAndrew Morgan2019-01-251-4/+5
| | * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-2575-1069/+1683
| | |\ | |_|/ |/| |
* | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-254-0/+86
|\ \ \ | |/ / |/| |
| * | Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synap...Andrew Morgan2019-01-243-3/+3
| |\ \
| | * | Apply suggestions from code reviewRichard van der Hoff2019-01-242-2/+2
| | * | Update synapse/api/filtering.pyRichard van der Hoff2019-01-241-1/+1
| * | | Remove redundant create event None checkAndrew Morgan2019-01-241-3/+0
| |/ /
| * | Do not return in a deferred functionAndrew Morgan2019-01-221-3/+3
| * | Ensure new filter is actually createdAndrew Morgan2019-01-222-2/+1
| * | Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-223-35/+51
| * | Add changelogAndrew Morgan2019-01-181-0/+1
| * | Search for messages across predecessor roomsAndrew Morgan2019-01-183-0/+73
* | | Merge pull request #4447 from matrix-org/erikj/msc_1813Erik Johnston2019-01-255-7/+37
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-2563-1025/+1459
| |\ \ \
| * | | | Review commentsErik Johnston2019-01-242-2/+4
* | | | | Merge pull request #4469 from matrix-org/revert-4451-erikj/require_format_ver...Erik Johnston2019-01-2518-253/+91
|\ \ \ \ \
| * | | | | Revert "Require event format version to parse or create events"Erik Johnston2019-01-2518-253/+91
|/ / / / /
* | | | | Merge pull request #4451 from matrix-org/erikj/require_format_versionErik Johnston2019-01-2518-91/+253
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_fo...Erik Johnston2019-01-2438-698/+509
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-245-13/+67
|\ \ \ \ \
| * | | | | Review commentsErik Johnston2019-01-242-1/+7
* | | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-245-39/+35
|\ \ \ \ \ \
| * | | | | | Update make_membership_event docsErik Johnston2019-01-241-2/+5
| * | | | | | Remove unecessary setting of outlier bitErik Johnston2019-01-241-2/+0
| * | | | | | Use term 'out of band membership' insteadErik Johnston2019-01-243-9/+10
* | | | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-246-4/+49
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fixAndrew Morgan2019-01-242-2/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Change default timeout value from 0 to NoneAndrew Morgan2019-01-241-1/+1
| * | | | | | | | Use self.clock instead of datetimeAndrew Morgan2019-01-241-4/+3
| * | | | | | | | isortAndrew Morgan2019-01-241-1/+1
| * | | | | | | | Add changelogAndrew Morgan2019-01-241-0/+1
| * | | | | | | | lintAndrew Morgan2019-01-241-1/+2
| * | | | | | | | Time out filtered room dir queries after 60sAndrew Morgan2019-01-241-2/+12
* | | | | | | | | Merge pull request #4464 from matrix-org/rav/fix_srv_lookupRichard van der Hoff2019-01-243-12/+89
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Look up the right SRV recordRichard van der Hoff2019-01-243-4/+12
| * | | | | | | | | lots more tests for MatrixFederationAgentRichard van der Hoff2019-01-241-10/+79
* | | | | | | | | | Generate the debian config during build (#4444)Richard van der Hoff2019-01-244-617/+33
* | | | | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460)Richard van der Hoff2019-01-242-2/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-245-9/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-223-7/+6
| * | | | | | | | | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-225-8/+16
* | | | | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_docNeil Johnson2019-01-242-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ChangelogDavid Baker2019-01-241-0/+1
| * | | | | | | | | | Clarify docs for public_baseurlDavid Baker2019-01-241-1/+5
| | |/ / / / / / / / | |/| | | | | | | |
* / | | | | | | | | Fix UPSERT check (#4459)Amber Brown2019-01-242-5/+29
|/ / / / / / / / /
* | | | | | | | | Use native UPSERTs where possible (#4306)Amber Brown2019-01-2414-43/+238
* | | | | | | | | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-243-6/+73
| | | | | * | | | Replace missed usages of FrozenEventErik Johnston2019-01-243-10/+14
| | | | | * | | | Fix testsErik Johnston2019-01-245-4/+14
| | | | | * | | | NewsfileErik Johnston2019-01-231-0/+1
| | | | | * | | | Require event format version to parse or create eventsErik Johnston2019-01-238-74/+193
| | | | | * | | | Merge branch 'erikj/fixup_rejecting_invites' of github.com:matrix-org/synapse...Erik Johnston2019-01-235-37/+32
| | | | | |\ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Clarify the invite flowsErik Johnston2019-01-233-7/+24
| | | * | | | | | Remove unnecessary '_sign_event'Erik Johnston2019-01-232-15/+8
| | | * | | | | | NewsfileErik Johnston2019-01-231-0/+1
| | | * | | | | | Store rejected remote invite events as outliersErik Johnston2019-01-233-38/+21
| |_|/ / / / / / |/| | | | | | |
| | | | * | | | Merge branch 'erikj/get_pdu_versions' into erikj/require_format_versionErik Johnston2019-01-2329-309/+937
| | | | |\ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | NewsfileErik Johnston2019-01-231-0/+1
| | | * | | | | Add room_version param to get_pduErik Johnston2019-01-234-13/+60
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backportAndrew Morgan2019-01-232-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Add changelogAndrew Morgan2019-01-231-0/+1
| * | | | | | | Add metric for user dir current event stream positionAndrew Morgan2019-01-231-0/+6
* | | | | | | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agentRichard van der Hoff2019-01-239-258/+555
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix python2 test failureRichard van der Hoff2019-01-231-1/+1
| * | | | | | | Add a test for MatrixFederationAgentRichard van der Hoff2019-01-222-1/+195
| * | | | | | | put resolve_service in an objectRichard van der Hoff2019-01-223-83/+104
| * | | | | | | Require that service_name be a byte stringRichard van der Hoff2019-01-222-8/+8
| * | | | | | | changelogRichard van der Hoff2019-01-221-0/+1
| * | | | | | | Kill off matrix_federation_endpointRichard van der Hoff2019-01-222-145/+0
| * | | | | | | Make MatrixFederationClient use MatrixFederationAgentRichard van der Hoff2019-01-222-27/+106
| * | | | | | | MatrixFederationAgentRichard van der Hoff2019-01-222-0/+147
* | | | | | | | debian package: symlink to python-3.X (#4433)Richard van der Hoff2019-01-233-2/+16
* | | | | | | | Fixup removal of duplicate `user_ips` rows (#4432)Erik Johnston2019-01-232-1/+6
* | | | | | | | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-238-36/+298
| | | | * | | | Merge branch 'erikj/msc_1813' into erikj/require_format_versionErik Johnston2019-01-235-8/+41
| | | |/| | | | | | | | |/ / /
| | | | * | | NewsfileErik Johnston2019-01-231-0/+1
| | | | * | | Implement MSC 1813 - Add room version to make APIsErik Johnston2019-01-234-8/+40
| | | * | | | Update newsfileErik Johnston2019-01-231-1/+1
| | | |/ / /
| | | * | | isortErik Johnston2019-01-232-4/+2
| | | * | | NewsfileErik Johnston2019-01-231-0/+1
| | | * | | Add support for persisting event format versionsErik Johnston2019-01-235-4/+50
| |_|/ / / |/| | | |
* | | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedupErik Johnston2019-01-222-26/+36
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Refactor to rewrite the SQL insteadErik Johnston2019-01-221-13/+16
| * | | | Don't shadow paramsErik Johnston2019-01-221-4/+3
| * | | | NewsfileErik Johnston2019-01-221-0/+1
| * | | | Fix bug when removing duplicate rows from user_ipsErik Johnston2019-01-221-13/+20
* | | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registrationNeil Johnson2019-01-223-11/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix line lengthNeil Johnson2019-01-211-1/+3
| * | | | Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-213-11/+13
| | | | * Move tag and direct state copying into separate functionAndrew Morgan2019-01-251-43/+63
| | | | * lintAndrew Morgan2019-01-221-1/+3
| | | | * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-223-172/+8
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Make key fetches use regular federation client (#4426)Richard van der Hoff2019-01-223-172/+8
| | | | * Prevent duplicate room IDs in m.directAndrew Morgan2019-01-221-10/+9
| | | | * Fix commentsAndrew Morgan2019-01-221-2/+2
| | | | * Join logic covers both room creator and arbitrary usersAndrew Morgan2019-01-221-33/+0
| | | | * tags, m.direct copying over correctlyAndrew Morgan2019-01-222-11/+62
| | | | * Fix typosAndrew Morgan2019-01-224-14/+14
| | | | * Migrating dm and room tags work for migratorAndrew Morgan2019-01-221-2/+13
| | | | * Prevent crash on user who doesn't have any direct roomsAndrew Morgan2019-01-221-1/+1
| | | | * Add changelogAndrew Morgan2019-01-221-0/+1
| | | | * Preserve DM status of a room on upgradeAndrew Morgan2019-01-221-0/+19
| | | | * Fix typoAndrew Morgan2019-01-221-2/+2
| |_|_|/ |/| | |
* | | | Refactor and bugfix for resove_service (#4427)Richard van der Hoff2019-01-226-86/+250
* | | | Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-228-57/+6
| |/ / |/| |
* | | Merge pull request #4402 from matrix-org/erikj/fed_v2_invite_serverErik Johnston2019-01-214-6/+42
|\ \ \ | |/ / |/| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv...Erik Johnston2019-01-2124-118/+261
| |\ \ | |/ / |/| |
* | | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apisErik Johnston2019-01-214-68/+74
|\ \ \
* | | | Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-213-0/+3
* | | | Fix race when persisting create event (#4404)Erik Johnston2019-01-182-1/+13
* | | | Tweak code coverage settings (#4400)Erik Johnston2019-01-183-0/+17
* | | | Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-184-93/+67
* | | | Fix incorrect logcontexts after a Deferred was cancelled (#4407)Richard van der Hoff2019-01-174-3/+117
| |_|/ |/| |
* | | sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-173-15/+18
* | | Changing macaroon_secret_key no longer logs you out (#4387)Richard van der Hoff2019-01-162-3/+1
* | | don't store more remote device lists if they have more than 1K devices (#4397)Richard van der Hoff2019-01-162-0/+20
* | | Merge pull request #4399 from andrewshadura/update-python-depsErik Johnston2019-01-162-2/+3
|\ \ \
| * | | Add a changelog entryAndrej Shadura2019-01-161-0/+1
| * | | Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynaclAndrej Shadura2019-01-161-1/+1
| * | | Use msgpack instead of msgpack-pythonAndrej Shadura2019-01-161-1/+1
|/ / /
* | | Merge pull request #4392 from matrix-org/neilj/fix_user_type_typoErik Johnston2019-01-152-1/+2
|\ \ \
| * | | ALL_USER_TYPES should be a tupleNeil Johnson2019-01-152-1/+2
|/ / /
| | * NewsfileErik Johnston2019-01-161-0/+1
| | * Add /v2/invite federation APIErik Johnston2019-01-153-6/+41
| |/
| * NewsfileErik Johnston2019-01-151-0/+1
| * Add groundwork for new versions of federation APIsErik Johnston2019-01-153-68/+73
|/
* Merge branch 'release-v0.34.1.1' into developRichard van der Hoff2019-01-124-49/+163
|\
| * moar plusses!Richard van der Hoff2019-01-121-2/+2
| * Rewrite build_debian_packages github/release-v0.34.1.1 release-v0.34.1.1Richard van der Hoff2019-01-122-46/+154
| * s/Breaks/Conflicts/ in debian/controlRichard van der Hoff2019-01-112-3/+9
* | Silence travis-ci build warnings by removing non-functional python3.6 (#4377)Richard van der Hoff2019-01-122-0/+8
* | Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-124-4/+164
* | Merge remote-tracking branch 'origin/master' into developAmber Brown2019-01-116-195/+51
|\ \
| * | Merge Synapse v0.34.1.1Amber Brown2019-01-116-195/+51
| |\|
| | * changelog, for debianAmber Brown2019-01-111-0/+6
| | * changelog v0.34.1.1Amber Brown2019-01-112-1/+14
| | * versionAmber Brown2019-01-111-1/+1
| | * Merge pull request #4374 from matrix-org/rav/macaroon_key_fix_0.34.1Amber Brown2019-01-114-194/+31
| |/|
| | * changelogRichard van der Hoff2019-01-102-1/+1
| | * Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-104-194/+31
| |/|
| | * Revert "Fix macaroon_secret_key fallback logic"Richard van der Hoff2019-01-101-3/+3
| | * changelogRichard van der Hoff2019-01-101-0/+1
| | * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-103-197/+33
| | |\
| | | * Fix macaroon_secret_key fallback logicRichard van der Hoff2019-01-101-3/+3
| | | * Skip macaroon check for access tokens in the dbRichard van der Hoff2019-01-102-186/+28
| | | * Fix fallback to signing key for macaroon-secret-keyRichard van der Hoff2019-01-101-2/+2
* | | | Merge pull request #4342 from aaronraimist/new-virtualenvRichard van der Hoff2019-01-102-3/+3
|\ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-27 18:55:41 +0000