summary refs log tree commit diff
path: root/synapse/api (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '97647b33c' into dinsicAndrew Morgan2020-12-311-1/+3
|\
| * type annotations for LruCacheRichard van der Hoff2020-10-161-1/+3
* | Merge commit '3ee17585c' into dinsicAndrew Morgan2020-12-311-3/+1
|\|
| * Make LruCache register its own metrics (#8561)Richard van der Hoff2020-10-161-3/+1
* | Merge commit '74976a8e4' into dinsicAndrew Morgan2020-12-311-0/+5
|\|
| * Do not assume that account data is of the correct form. (#8454)Patrick Cloke2020-10-051-0/+5
* | Allow users to click account renewal links multiple times without hitting an ...Andrew Morgan2020-12-301-2/+2
* | Merge commit '2983049a7' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-211-5/+1
|\|
| * Don't push if an user account has expired (#8353)Mathieu Velten2020-09-231-5/+1
* | Merge commit '4325be1a5' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-212-28/+24
|\|
| * Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-182-28/+24
* | Merge commit 'a3a90ee03' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-0/+1
|\|
| * Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-0/+1
* | Merge commit 'cca03dbec' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-1/+1
|\|
| * Directly import json from the standard library. (#8259)Patrick Cloke2020-09-081-1/+1
* | Merge commit '17fa4c7ca' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-208-26/+26
|\|
| * Stop sub-classing object (#8249)Patrick Cloke2020-09-048-26/+26
* | Merge commit '56efa9ec7' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-0/+8
|\|
| * 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
* | Merge commit '2df82ae45' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-0/+37
|\ \
| * | Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-241-0/+37
* | | Merge commit 'c9c544cda' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-3/+3
|\ \ \ | | |/ | |/|
| * | Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-191-3/+3
* | | Merge commit 'e04e465b4' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-193-2/+81
|\| |
| * | 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
| |/
* | Merge commit 'd4a7829b1' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-193-81/+65
|\|
| * Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-063-80/+63
* | Merge commit '66f24449d' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-1/+3
|\|
| * Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-061-1/+3
* | Merge commit '3950ae51e' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-161-1/+1
|\|
| * Convert a synapse.events to async/await. (#7949)Patrick Cloke2020-07-271-1/+1
* | Don't push if an user account has expired (#58)Mathieu Velten2020-09-181-5/+4
* | Remove duplicated error definitions, likely due to mergeAndrew Morgan2020-09-021-7/+0
* | Merge commit 'f88c48f3b' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-4/+8
|\|
| * Convert state resolution to async/await (#7942)Patrick Cloke2020-07-241-4/+8
* | Merge commit 'a973bcb8a' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-1/+3
|\|
| * Ensure that calls to `json.dumps` are compatible with the standard library js...Patrick Cloke2020-07-151-1/+3
* | Merge commit '4db150951' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-55/+73
|\|
| * Improve the type hints of synapse.api.errors. (#7820)Patrick Cloke2020-07-141-55/+73
* | Merge commit '66a4af8d9' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-4/+2
|\|
| * Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-101-4/+2
* | Merge commit '43726783e' into dinsicAndrew Morgan2020-08-031-3/+2
|\|
| * Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-091-1/+1
| * isort 5 compatibility (#7786)Will Hunt2020-07-051-2/+1
* | Merge commit 'a3f11567d' into dinsicAndrew Morgan2020-08-033-9/+5
|\|
| * Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-163-9/+5
* | Merge commit '03619324f' into dinsicAndrew Morgan2020-08-033-5/+7
|\|
| * 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
* | Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-243-44/+123
|\|
| * 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
* | Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-102-24/+60
|\|
| * 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
* | Merge branch 'release-v1.13.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-104-80/+139
|\|
| * 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
* | Fix sytest CIAndrew Morgan2020-05-281-1/+0
* | Remove special auth and redaction rules for aliases events in experimental ro...Andrew Morgan2020-03-241-4/+5
|\|
| * 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)Andrew Morgan2020-03-241-7/+2
|\|
| * 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)Andrew Morgan2020-03-241-0/+1
|\|
| * Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-031-0/+1
* | Stop returning aliases as part of the room list. (#6970)Andrew Morgan2020-03-241-5/+5
|\|
| * Publishing/removing from the directory requires a power level greater than ca...Patrick Cloke2020-02-211-5/+5
* | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableAndrew Morgan2020-03-241-45/+49
|\|
| * 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)Andrew Morgan2020-03-231-2/+1
|\|
| * Fix detecting unknown devices from remote encrypted events. (#6848)Erik Johnston2020-02-041-2/+1
* | Merge pull request #6820 from matrix-org/rav/get_room_version_idAndrew Morgan2020-03-231-4/+2
|\|
| * Add `get_room_version` methodRichard van der Hoff2020-01-311-4/+2
* | Merge pull request #6787 from matrix-org/rav/msc2260Andrew Morgan2020-03-231-0/+16
|\|
| * 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)Andrew Morgan2020-03-231-2/+5
|\|
| * 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)Andrew Morgan2020-03-232-3/+8
|\|
| * Fixup synapse.api to pass mypy (#6733)Erik Johnston2020-01-202-3/+8
* | Add StateMap type alias (#6715)Andrew Morgan2020-03-231-6/+2
|\|
| * Add StateMap type alias (#6715)Erik Johnston2020-01-161-6/+2
* | Implement RedirectException (#6687)Andrew Morgan2020-03-231-1/+26
|\|
| * Implement RedirectException (#6687)Richard van der Hoff2020-01-151-1/+26
* | Kill off RegistrationError (#6691)Andrew Morgan2020-03-231-6/+0
|\|
| * Kill off RegistrationError (#6691)Richard van der Hoff2020-01-131-6/+0
* | Remove unused, undocumented "content repo" resource (#6628)Andrew Morgan2020-03-201-1/+0
|\|
| * Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-031-1/+0
* | Change EventContext to use the Storage class (#6564)Andrew Morgan2020-03-201-1/+1
|\|
| * Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-201-1/+1
* | Add auth events as per spec. (#6556)Andrew Morgan2020-03-191-67/+34
|\|
| * Add auth events as per spec. (#6556)Erik Johnston2019-12-161-67/+34
* | Merge pull request #6329 from matrix-org/babolivier/context_filtersAndrew Morgan2020-03-192-1/+5
|\|
| * 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)Andrew Morgan2020-03-191-0/+4
|\| | |
| * | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+4
| | |/ | |/|
| * | Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-261-1/+1
| |\ \
| * | | Implement per-room message retention policiesBrendan Abolivier2019-11-041-0/+2
| | |/ | |/|
* | | Replace instance variations of homeserver with correct case/spacing (#6357)Andrew Morgan2020-03-181-1/+1
|\ \ \ | | |/ | |/|
| * | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-121-1/+1
| |/
* | Merge pull request #6301 from matrix-org/babolivier/msc2326Andrew Morgan2020-03-162-2/+20
|\|
| * 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 Morgan2020-03-161-1/+1
|\| |
| * | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-311-1/+1
| |/
* | Option to suppress resource exceeded alerting (#6173)Andrew Morgan2020-03-162-3/+16
|\|
| * Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-242-3/+16
* | Remove Auth.check method (#6217)Andrew Morgan2020-03-162-18/+2
|\|
| * 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
* | | | | | | Merge pull request #6214 from matrix-org/rav/event_auth/1Andrew Morgan2020-03-161-2/+0
|\| | | | | |
| * | | | | | rip out some unreachable codeRichard van der Hoff2019-10-171-2/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Fix up some typechecking (#6150)Andrew Morgan2020-02-262-2/+6
|\| | | | |
| * | | | | Fix up some typechecking (#6150)Amber Brown2019-10-022-2/+6
* | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanAndrew Morgan2020-02-251-1/+3
|\| | | | |
| * | | | | 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
* | | | | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-registerAndrew Morgan2020-02-251-2/+9
|\| | | | |
| * | | | | Ensure support users can be registered even if MAU limit is reachedJason Robinson2019-09-111-2/+9
| | |_|_|/ | |/| | |
* | | | | Remove double return statements (#5962)Andrew Morgan2020-02-251-1/+0
|\| | | |
| * | | | Remove double return statements (#5962)Andrew Morgan2019-09-031-1/+0
* | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-241-7/+7
|\| | | |
| * | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-7/+7
| | |_|/ | |/| |
* | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentAndrew Morgan2020-02-241-1/+2
|\| | |
| * | | Add bot typeHalf-Shot2019-08-231-1/+2
* | | | Opentracing misc (#5856)Andrew Morgan2020-02-201-0/+4
|\| | |
| * | | Opentracing misc (#5856)Jorik Schellekens2019-08-161-0/+4
* | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2020-02-201-1/+2
|\| | |
| * | | 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)Andrew Morgan2020-02-201-23/+5
|\| |
| * | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-23/+5
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-192-20/+16
|\| |
| * | Replace returnValue with return (#5736)Amber Brown2019-07-232-25/+21
| |/
* | Ignore redactions of m.room.create events (#5701)Andrew Morgan2020-02-191-15/+0
|\|
| * 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 Morgan2020-02-171-0/+16
|\|
| * Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2019-07-151-0/+16
* | Implement access token expiry (#5660)Andrew Morgan2020-02-172-1/+19
|\|
| * Implement access token expiry (#5660)Richard van der Hoff2019-07-122-1/+19
* | Clean up exception handling for access_tokens (#5656)Andrew Morgan2020-02-172-82/+71
|\|
| * Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-112-89/+71
* | Run Black. (#5482)Andrew Morgan2020-02-132-23/+23
|\|
| * 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
| |\
* | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-117-317/+212
* | | Implement per-room message retention policiesBrendan Abolivier2019-08-281-0/+2
* | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-124-11/+24
|\| |
| * | 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
* | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-113-3/+37
|\| |
| * | 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
* | | | Merge branch 'babolivier/account_validity_send_mail_auth' into dinsic dinsic_2019-06-10Brendan 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
| |/ /
* | | Merge pull request #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-221-1/+25
|\ \ \
| * | | Make error messages more explicitBrendan Abolivier2019-05-211-2/+6
| * | | First implementation of MSC2000Brendan Abolivier2019-05-201-1/+21
| |/ /
* | | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-171-2/+1
|\| |
| * | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-151-2/+1
| |/
* | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-142-3/+7
|\|
| * 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
| | |\
| * | | 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
* | | Move lookup endpoint to CS API (and s/is_server/id_server/)Brendan Abolivier2019-04-301-1/+0
* | | [DINSIC] Add ability to proxy identity lookups (#5048)Andrew Morgan2019-04-161-0/+1
* | | Merge branch 'develop' into dinsicAndrew Morgan2019-04-155-42/+107
|\ \ \ | | |/ | |/|
| * | 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
| |\|
| | * Add account expiration featureBrendan 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
| |/
* | Merge branch 'master' of github.com:matrix-org/synapse into dinsicErik Johnston2019-04-051-11/+11
|\|
| * Support 3PID login in password providers (#4931)Andrew Morgan2019-03-261-11/+11
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-mergedErik Johnston2019-03-212-18/+33
|\|
| * 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
* | FixupsErik Johnston2019-03-151-0/+6
* | Merge branch 'master' of github.com:matrix-org/synapse into erikj/dinsic-merg...Erik Johnston2019-03-155-75/+151
|\|
| * 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
| | |\