summary refs log tree commit diff
path: root/synapse/api (follow)
Commit message (Expand)AuthorAgeFilesLines
* Support MSC3289: Room version 8 (#10449)Patrick Cloke2021-08-092-15/+15
* Make historical events discoverable from backfill for servers without any scr...Eric Eastwood2021-07-282-3/+27
* Merge tag 'v1.39.0rc3' into developErik Johnston2021-07-281-0/+8
|\
| * Always communicate device OTK counts to clients (#10485)Andrew Morgan2021-07-271-0/+8
* | Support for MSC2285 (hidden read receipts) (#10413)Å imon Brandner2021-07-281-0/+4
* | Update the MSC3083 support to verify if joins are from an authorized server. ...Patrick Cloke2021-07-262-1/+4
* | Switch to `chunk` events so we can auth via power_levels (MSC2716) (#10432)Eric Eastwood2021-07-211-2/+4
* | MSC3244 room capabilities implementation (#10283)Michael Telatynski2021-07-201-2/+36
|/
* Add a module type for account validity (#9884)Brendan Abolivier2021-07-161-7/+10
* Use inline type hints in various other places (in `synapse/`) (#10380)Jonathan de Jong2021-07-155-10/+8
* Fix messages from multiple senders in historical chunk (MSC2716) (#10276)Eric Eastwood2021-07-131-4/+33
* Move methods involving event authentication to EventAuthHandler. (#10268)Patrick Cloke2021-07-011-73/+2
* Correct type hints for synapse.event_auth. (#10253)Patrick Cloke2021-06-301-2/+3
* Do not recurse into non-spaces in the spaces summary. (#10256)Patrick Cloke2021-06-291-0/+6
* MSC2918 Refresh tokens implementation (#9450)Quentin Gliech2021-06-241-0/+5
* Add endpoints for backfilling history (MSC2716) (#9247)Eric Eastwood2021-06-222-5/+17
* Update MSC3083 support per changes in the MSC. (#10189)Patrick Cloke2021-06-171-0/+6
* Make opentracing trace into event persistence (#10134)Richard van der Hoff2021-06-161-2/+2
* Remove support for unstable MSC1772 prefixes. (#10161)Patrick Cloke2021-06-151-3/+0
* Remove the experimental flag for knocking and use stable prefixes / endpoints...Patrick Cloke2021-06-152-5/+6
* Implement knock feature (#6739)Sorunome2021-06-093-4/+29
* Set opentracing priority before setting other tags (#10092)Richard van der Hoff2021-05-281-4/+4
* Remove the experimental spaces enabled flag. (#10063)Patrick Cloke2021-05-261-1/+1
* Support enabling opentracing by user (#9978)Richard van der Hoff2021-05-141-0/+5
* Correctly ratelimit invites when creating a room (#9968)Brendan Abolivier2021-05-121-5/+17
* Fix `m.room_key_request` to-device messages (#9961)Richard van der Hoff2021-05-111-1/+4
* Follow-up to #9915 to correct the identifier for room types.Patrick Cloke2021-05-051-1/+1
* Support stable MSC1772 spaces identifiers. (#9915)Patrick Cloke2021-05-051-0/+3
* Improved validation for received requests (#9817)Richard van der Hoff2021-04-231-0/+3
* Add type hints to auth and auth_blocking. (#9876)Patrick Cloke2021-04-232-42/+45
* Check for space membership during a remote join of a restricted room (#9814)Patrick Cloke2021-04-231-0/+1
* Port "Allow users to click account renewal links multiple times without hitti...Andrew Morgan2021-04-191-2/+4
* Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-149-9/+0
* Require AppserviceRegistrationType (#9548)Will Hunt2021-04-121-0/+5
* Add an experimental room version to support restricted join rules. (#9717)Patrick Cloke2021-03-312-1/+25
* Make RateLimiter class check for ratelimit overrides (#9711)Erik Johnston2021-03-301-45/+55
* Make it possible to use dmypy (#9692)Erik Johnston2021-03-261-0/+5
* Merge branch 'develop' into babolivier/msc3026Brendan Abolivier2021-03-191-0/+6
|\
| * Initial spaces summary API (#9643)Richard van der Hoff2021-03-181-0/+6
* | Implement MSC3026: busy presence stateBrendan Abolivier2021-03-181-0/+1
|/
* Fix additional type hints from Twisted 21.2.0. (#9591)Patrick Cloke2021-03-121-1/+1
* Record the SSO Auth Provider in the login token (#9510)Richard van der Hoff2021-03-041-32/+9
* Ratelimit cross-user key sharing requests. (#8957)Patrick Cloke2021-02-192-6/+11
* Add type hints to groups code. (#9393)Patrick Cloke2021-02-171-0/+5
* Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-164-19/+24
* Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-111-0/+2
* Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-201-2/+0
* Kill off `HomeServer.get_ip_from_request()` (#9080)Richard van der Hoff2021-01-121-2/+2
* Remove SynapseRequest.get_user_agent (#9069)Richard van der Hoff2021-01-121-1/+2
* Implement MSC2176: Updated redaction rules (#8984)Patrick Cloke2021-01-051-6/+26
* Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-181-0/+7
|\
| * Don't MAU limit AS ghost usersErik Johnston2020-12-171-0/+7
* | Try and drop stale extremities. (#8929)Erik Johnston2020-12-181-0/+2
* | Do not assume that the contents dictionary includes history_visibility. (#8945)Patrick Cloke2020-12-162-2/+10
* | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-111-1/+3
|/
* Add admin API for logging in as a user (#8617)Erik Johnston2020-11-171-4/+29
* Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-291-67/+46
* Fix handling of User-Agent headers with bad utf-8. (#8632)Erik Johnston2020-10-231-3/+1
* type annotations for LruCacheRichard van der Hoff2020-10-161-1/+3
* Make LruCache register its own metrics (#8561)Richard van der Hoff2020-10-161-3/+1
* Do not assume that account data is of the correct form. (#8454)Patrick Cloke2020-10-051-0/+5
* Don't push if an user account has expired (#8353)Mathieu Velten2020-09-231-5/+1
* Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-182-28/+24
* Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-0/+1
* Directly import json from the standard library. (#8259)Patrick Cloke2020-09-081-1/+1
* Stop sub-classing object (#8249)Patrick Cloke2020-09-048-26/+26
* Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-211-0/+37
* Stop shadow-banned users from sending invites. (#8095)Patrick Cloke2020-08-201-0/+8
* Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-191-3/+3
* Convert stream database to async/await. (#8074)Patrick Cloke2020-08-172-1/+70
* Add a shadow-banned flag to users. (#8092)Patrick Cloke2020-08-141-1/+11
* Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-063-80/+63
* Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-061-1/+3
* Convert a synapse.events to async/await. (#7949)Patrick Cloke2020-07-271-1/+1
* Convert state resolution to async/await (#7942)Patrick Cloke2020-07-241-4/+8
* Ensure that calls to `json.dumps` are compatible with the standard library js...Patrick Cloke2020-07-151-1/+3
* Improve the type hints of synapse.api.errors. (#7820)Patrick Cloke2020-07-141-55/+73
* Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-101-4/+2
* Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-091-1/+1
* isort 5 compatibility (#7786)Will Hunt2020-07-051-2/+1
* Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-163-9/+5
* Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-152-5/+2
* Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-101-0/+5
* Update to the stable SSO prefix for UI Auth. (#7630)Patrick Cloke2020-06-051-1/+1
* Fix type information on `assert_*_is_admin` methods (#7645)Richard van der Hoff2020-06-051-4/+4
* Remove some unused constants. (#7644)Richard van der Hoff2020-06-051-4/+0
* Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-051-35/+118
* Implement room version 6 (MSC2240). (#7506)Patrick Cloke2020-05-151-26/+4
* Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-141-1/+23
* Enforce MSC2209: auth rules for notifications in power level event (#7502)Patrick Cloke2020-05-141-1/+21
* Allow expired accounts to logout (#7443)Andrew Morgan2020-05-141-17/+33
* Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-111-2/+2
* Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-062-73/+114
* async/await is_server_admin (#7363)Andrew Morgan2020-05-011-5/+4
* Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-221-0/+2
* Convert http.HTTPStatus objects to their int equivalent (#7188)Andrew Morgan2020-04-031-1/+8
* Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-011-0/+1
* Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-261-0/+21
* Remove special auth and redaction rules for aliases events in experimental ro...Patrick Cloke2020-03-091-4/+5
* Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-041-7/+2
* Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-031-0/+1
* Publishing/removing from the directory requires a power level greater than ca...Patrick Cloke2020-02-211-5/+5
* Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-191-3/+13
* Refactor the membership check methods in AuthRichard van der Hoff2020-02-181-43/+37
* Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-041-2/+1
* Add `get_room_version` methodRichard van der Hoff2020-01-311-4/+2
* Implement updated auth rules from MSC2260Richard van der Hoff2020-01-281-0/+16
* Pass room version object into event_auth.check and check_redaction (#6788)Richard van der Hoff2020-01-281-2/+5
* Fixup synapse.api to pass mypy (#6733)Erik Johnston2020-01-202-3/+8
* Add StateMap type alias (#6715)Erik Johnston2020-01-161-6/+2
* Implement RedirectException (#6687)Richard van der Hoff2020-01-151-1/+26
* Kill off RegistrationError (#6691)Richard van der Hoff2020-01-131-6/+0
* Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-031-1/+0
* Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-201-1/+1
* Add auth events as per spec. (#6556)Erik Johnston2019-12-161-67/+34
* Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-042-1/+5
|\
| * Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-042-1/+3
| |\
| * | Update copyrightsBrendan Abolivier2019-11-052-1/+5
* | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+4
| |/ |/|
* | Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-261-1/+1
|\ \
| * | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-121-1/+1
| |/
* / Implement per-room message retention policiesBrendan Abolivier2019-11-041-0/+2
|/
* Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-012-2/+20
|\
| * Incorporate reviewBrendan Abolivier2019-11-012-2/+2
| * LintBrendan Abolivier2019-11-011-0/+1
| * Incorporate reviewBrendan Abolivier2019-11-012-3/+8
| * Add unit testsBrendan Abolivier2019-10-301-1/+1
| * Implement filteringBrendan Abolivier2019-10-301-2/+11
| * Store labels for new eventsBrendan Abolivier2019-10-301-0/+3
* | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-311-1/+1
|/
* Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-242-3/+16
* Remove Auth.check method (#6217)Richard van der Hoff2019-10-181-18/+1
* Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-181-0/+1
|\
| * Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-183-5/+18
| |\
| * \ Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-041-8/+7
| |\ \
| * \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-283-2/+8
| |\ \ \
| * \ \ \ Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-012-48/+26
| |\ \ \ \
| * | | | | allow uploading keys for cross-signingHubert Chathi2019-07-251-0/+1
* | | | | | rip out some unreachable codeRichard van der Hoff2019-10-171-2/+0
| |_|_|_|/ |/| | | |
* | | | | Fix up some typechecking (#6150)Amber Brown2019-10-022-2/+6
* | | | | Add device and appservice tagsErik Johnston2019-09-251-0/+3
* | | | | Don't create new span for get_user_by_reqErik Johnston2019-09-251-1/+0
* | | | | Ensure support users can be registered even if MAU limit is reachedJason Robinson2019-09-111-2/+9
| |_|_|/ |/| | |
* | | | Remove double return statements (#5962)Andrew Morgan2019-09-031-1/+0
* | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-7/+7
| |_|/ |/| |
* | | Add bot typeHalf-Shot2019-08-231-1/+2
* | | Opentracing misc (#5856)Jorik Schellekens2019-08-161-0/+4
* | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-311-1/+2
| |/ |/|
* | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-23/+5
* | Replace returnValue with return (#5736)Amber Brown2019-07-232-25/+21
|/
* Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-171-15/+0
* Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2019-07-151-0/+16
* Implement access token expiry (#5660)Richard van der Hoff2019-07-122-1/+19
* Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-112-89/+71
* Run Black. (#5482)Amber Brown2019-06-207-337/+231
* Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai...Brendan Abolivier2019-06-101-2/+13
|\
| * Better wordingBrendan Abolivier2019-06-101-1/+1
| * DocBrendan Abolivier2019-06-101-0/+5
| * Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-2/+8
* | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-061-0/+9
* | Implement room v5 which enforces signing key validityRichard van der Hoff2019-06-051-5/+5
* | Add a test room version where we enforce key validity (#5348)Richard van der Hoff2019-06-051-7/+13
* | Implement the SHHS complexity API (#5216)Amber Brown2019-05-301-0/+1
* | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-4/+0
* | Room Statistics (#4338)Amber Brown2019-05-211-0/+1
* | Introduce room v4 which updates event ID format. (#5217)Richard van der Hoff2019-05-211-4/+4
* | Fix error handling for rooms whose versions are unknown. (#5219)Richard van der Hoff2019-05-211-1/+15
* | Add a test room version which updates event ID format (#5210)Richard van der Hoff2019-05-201-2/+11
* | Rename relation types to match MSCErik Johnston2019-05-201-2/+2
* | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+8
|\ \
| * | Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+8
* | | Limit UserIds to a length that fits in a state key (#5198)ReidAnderson2019-05-201-0/+3
| |/ |/|
* | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-151-2/+1
|/
* Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-081-0/+3
* Factor out an "assert_requester_is_admin" function (#5120)Richard van der Hoff2019-05-021-1/+1
* Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-174-43/+95
|\
| * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-2/+3
| |\
| * | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-113-3/+3
| * | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-092-0/+13
| |\ \
| * | | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-021-0/+1
| * | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-012-40/+91
* | | | Add management endpoints for account validityBrendan Abolivier2019-04-171-1/+1
| |_|/ |/| |
* | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-2/+3
| |/ |/|
* | Add account expiration featureBrendan Abolivier2019-04-092-0/+13
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-261-11/+11
* Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-191-3/+5
* Add ratelimiting on login (#4821)Brendan Abolivier2019-03-151-0/+12
* Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-15/+16
* Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-01-301-1/+1
|\
| * Update constants.pyNeil Johnson2019-01-301-1/+1
* | by default include m.room.encryption on invites (#3902)Matthew Hodgson2019-01-301-0/+1
|/
* Merge branch 'develop' into neilj/room_capabilitiesNeil Johnson2019-01-303-20/+43
|\
| * Enable room version v3Erik Johnston2019-01-291-1/+2
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-292-12/+3
| |\
| | * Implement event format v2Erik Johnston2019-01-291-0/+2
| | * Remove dead functionErik Johnston2019-01-291-11/+0
| | * Replace usage of builder.user_id with builder.senderErik Johnston2019-01-291-1/+1
| * | Drop vdh supportErik Johnston2019-01-291-2/+0
| * | Finish comment...Erik Johnston2019-01-291-1/+1
| * | Implement rechecking of redactionsErik Johnston2019-01-291-2/+2
| * | Add RoomVersions.V3 constant, without enabling itErik Johnston2019-01-291-0/+1
| |/
| * Pass through room version to event authErik Johnston2019-01-251-4/+10
| * Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-251-0/+14
| |\
| | * Update synapse/api/filtering.pyRichard van der Hoff2019-01-241-1/+1
| | * Ensure new filter is actually createdAndrew Morgan2019-01-221-1/+1
| | * Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-221-2/+13
| | * Search for messages across predecessor roomsAndrew Morgan2019-01-181-0/+3
| * | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-241-0/+13
| |\ \
| | * | Add support for persisting event format versionsErik Johnston2019-01-231-0/+13
* | | | define room dispositions for use in exposing room capabilitiesNeil Johnson2019-01-301-0/+5
* | | | reflect that rooms v3 is a stable room versionNeil Johnson2019-01-301-0/+1
* | | | backout v3Neil Johnson2019-01-251-1/+0
* | | | track unstable room v3Neil Johnson2019-01-251-0/+2
|/ / /
* / / Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-221-1/+3
|/ /
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv...Erik Johnston2019-01-211-1/+2
|\ \
| * \ Merge pull request #4390 from matrix-org/erikj/versioned_fed_apisErik Johnston2019-01-211-1/+2
| |\ \
| * | | Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-211-0/+1
| | |/ | |/|
| * | ALL_USER_TYPES should be a tupleNeil Johnson2019-01-151-1/+1
* | | Add /v2/invite federation APIErik Johnston2019-01-151-0/+1
| |/ |/|
* | Add groundwork for new versions of federation APIsErik Johnston2019-01-151-1/+2
|/
* Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-101-38/+27
|\
| * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-101-38/+27
| |\
| | * Skip macaroon check for access tokens in the dbRichard van der Hoff2019-01-101-38/+27
* | | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-081-0/+18
* | | fix the check for whether `is_url` to match all the other ones in codebase (#...Michael Telatynski2019-01-061-3/+8
* | | Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-241-0/+2
|\ \ \
| * | | Add v2 room versionErik Johnston2018-12-181-0/+2
* | | | create support user (#4141)Neil Johnson2018-12-142-2/+11
| |/ / |/| |
* | | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-041-9/+20
|/ /
* | Merge pull request #4004 from matrix-org/travis/login-termsTravis Ralston2018-11-011-0/+1
|\ \
| * \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-312-1/+1
| |\ \
| * \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-241-1/+4
| |\ \ \
| * \ \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-151-0/+15
| |\ \ \ \
| * | | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-031-0/+1
* | | | | | Add STATE_V2_TEST room versionErik Johnston2018-11-011-1/+6
| |_|_|/ / |/| | | |
* | | | | Remove deprecated v1 key exchange endpoint (#4119)Amber Brown2018-10-311-1/+0
* | | | | Basic initial support for room upgradesRichard van der Hoff2018-10-251-0/+1
| |_|/ / |/| | |
* | | | Allow backslashes in event field filtersRichard van der Hoff2018-10-241-1/+4
| |/ / |/| |
* | | PR feedback pt. 1David Baker2018-10-121-8/+0
* | | Fix mergefailDavid Baker2018-10-091-1/+1
* | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-094-9/+23
|\| |
| * | Fix userconsent on Python 3 (#3938)Amber Brown2018-10-021-1/+1
| * | Replaced all occurences of e.message with str(e)Schnuffle2018-09-271-1/+1
| * | Implement 'event_format' filter param in /syncRichard van der Hoff2018-09-041-0/+1
| * | assert rather than warn hhs-4Neil Johnson2018-08-311-3/+2
| * | move threepid checker to config, add missing yieldsNeil Johnson2018-08-311-2/+11
| * | fix reference to is_threepid_reservedNeil Johnson2018-08-311-1/+1
| * | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-311-5/+2
| * | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-311-1/+9
| * | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-242-5/+5