summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2Andrew Morgan2020-03-161-1/+2
|\
| * Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2Richard van der Hoff2019-11-051-1/+2
| |\
| | * Fix exception when OpenGraph tag values are intsRichard van der Hoff2019-11-051-1/+2
* | | Merge pull request #6331 from matrix-org/rav/url_preview_limit_titleAndrew Morgan2020-03-161-1/+19
|\| |
| * | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-0513-159/+146
| |\ \ | | |/ | |/|
| * | Apply suggestions from code reviewRichard van der Hoff2019-11-051-1/+1
| * | Strip overlong OpenGraph data from url previewRichard van der Hoff2019-11-051-1/+19
* | | Merge pull request #6301 from matrix-org/babolivier/msc2326Andrew Morgan2020-03-161-0/+3
|\ \ \ | | |/ | |/|
| * | Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-011-0/+3
| |\ \
| | * | Add unstable feature flagBrendan Abolivier2019-11-011-0/+3
| * | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-012-1/+3
* | | | Update black to 19.10b0 (#6304)Andrew Morgan2020-03-164-11/+12
|\| | |
| * | | Update black to 19.10b0 (#6304)Amber Brown2019-11-014-11/+12
* | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2020-03-168-30/+32
|\| | |
| * | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-318-30/+32
* | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitAndrew Morgan2020-03-162-15/+9
|\| | |
| * | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-302-15/+9
| |\ \ \
| | * | | Port receipt and read markers to async/waitErik Johnston2019-10-292-15/+9
| | |/ /
* | | | Merge pull request #6275 from matrix-org/erikj/port_rest_eventsAndrew Morgan2020-03-161-94/+72
|\| | |
| * | | Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
| |/ /
* | | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingAndrew Morgan2020-03-162-9/+16
|\| |
| * | Address codestyle concernsMichael Kaye2019-10-242-2/+9
| * | Delay printf until logging is required.Michael Kaye2019-10-242-9/+9
| |/
* | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Andrew Morgan2020-03-161-1/+52
|\|
| * Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1817-346/+585
| |\
| * \ Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-075-168/+346
| |\ \
| * | | update with newer coding styleHubert Chathi2019-09-041-2/+2
| * | | make black happyHubert Chathi2019-09-041-0/+1
| * | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+1
| * | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+50
* | | | Remove Auth.check method (#6217)Andrew Morgan2020-03-161-3/+43
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1817-346/+585
| |\ \ \
| * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-075-168/+346
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0439-193/+195
| |\ \ \
| * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2813-173/+367
| |\ \ \ \
| * | | | | apply PR review suggestionsHubert Chathi2019-08-211-1/+1
| * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0139-297/+309
| |\ \ \ \ \
| * | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-251-3/+43
* | | | | | | Merge branch 'master' into developAndrew Morgan2020-02-265-114/+84
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #6196 from matrix-org/erikj/awaitErik Johnston2019-10-185-114/+84
| |\ \ \ \ \ \
| | * | | | | | Port synapse/rest/client/_base.py to async/awaitErik Johnston2019-10-111-9/+5
| | * | | | | | Add maybe_awaitable and fix __init__ bugsErik Johnston2019-10-111-2/+5
| | * | | | | | Port synaps/rest/client/users.py to async/awaitErik Johnston2019-10-111-11/+7
| | * | | | | | Port synaps/rest/client/server_notice_servlet.py to async/awaitErik Johnston2019-10-111-6/+3
| | * | | | | | Port synaps/rest/client/media.py to async/awaitErik Johnston2019-10-111-16/+11
| | * | | | | | Port rest/admin/__init__.py to async/awaitErik Johnston2019-10-111-72/+55
* | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionAndrew Morgan2020-02-261-1/+1
|\| | | | | | |
| * | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-1/+1
* | | | | | | | | cas: support setting display name (#6114)Andrew Morgan2020-02-261-1/+3
|\| | | | | | | |
| * | | | | | | | cas: support setting display name (#6114)Valérian Rousset2019-10-111-1/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytesAndrew Morgan2020-02-261-2/+2
|\| | | | | | |
| * | | | | | | Fix store_url_cache using bytesErik Johnston2019-10-101-2/+2
* | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)Andrew Morgan2020-02-262-22/+31
|\| | | | | | |
| * | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-102-22/+31
| |/ / / / / /
* | | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Andrew Morgan2020-02-261-2/+6
|\| | | | | |
| * | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Anshul Angaria2019-10-081-2/+6
* | | | | | | Log responder we are using. (#6139)Andrew Morgan2020-02-261-1/+1
|\| | | | | |
| * | | | | | Log responder we are using. (#6139)Michael Kaye2019-10-071-1/+1
* | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Andrew Morgan2020-02-261-3/+11
|\| | | | | |
| * | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Robert Swain2019-10-041-3/+11
* | | | | | | Land improved room list based on room stats (#6019)Andrew Morgan2020-02-261-0/+8
|\| | | | | |
| * | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-0/+8
* | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-261-2/+2
|\| | | | | |
* | | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanAndrew Morgan2020-02-251-0/+18
|\| | | | | |
| * | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanErik Johnston2019-09-271-0/+18
| |\ \ \ \ \ \
| | * | | | | | isortErik Johnston2019-09-251-1/+1
| | * | | | | | Add tags for event_id and txn_id in event sendingErik Johnston2019-09-251-0/+18
* | | | | | | | Kill off half-implemented password-reset via sms (#6101)Andrew Morgan2020-02-251-66/+1
|\| | | | | | |
| * | | | | | | Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-261-64/+1
* | | | | | | | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-251-3/+29
|\| | | | | | |
| * | | | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-3/+29
* | | | | | | | Refactor code for calculating registration flows (#6106)Andrew Morgan2020-02-251-62/+62
|\| | | | | | |
| * | | | | | | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-251-62/+62
| |/ / / / / /
* | | | | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-251-0/+14
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-243-75/+316
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1944-425/+732
| |\ \ \ \ \ \ \
| * | | | | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-0/+14
* | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2020-02-251-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2019-09-231-0/+2
* | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2020-02-251-0/+3
|\| | | | | | | |
| * | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2019-09-231-0/+3
* | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2020-02-251-1/+13
|\| | | | | | | |
| * | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2019-09-231-1/+13
* | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2020-02-251-2/+45
|\| | | | | | | |
| * | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-231-2/+45
* | | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-252-70/+127
|\| | | | | | | |
| * | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-232-72/+95
* | | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2020-02-251-0/+5
|\| | | | | | | |
| * | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-231-0/+5
* | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-252-64/+252
|\| | | | | | | |
| * | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-202-51/+225
* | | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint (#6...Andrew Morgan2020-02-251-1/+1
|\| | | | | | | |
| * | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint (#6...Andrew Morgan2019-09-201-1/+1
* | | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2020-02-251-4/+0
|\| | | | | | | |
| * | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2019-09-201-4/+0
* | | | | | | | | Use unstable prefix for 3PID unbind API (#6062)Andrew Morgan2020-02-251-1/+1
|\| | | | | | | |
| * | | | | | | | Use unstable prefix for 3PID unbind API (#6062)J. Ryan Stinnett2019-09-191-1/+1
* | | | | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2020-02-251-19/+0
|\| | | | | | | |
| * | | | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2019-09-191-17/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2020-02-251-0/+1
|\| | | | | | |
| * | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-111-0/+1
* | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationAndrew Morgan2020-02-251-1/+2
|\| | | | | | |
| * | | | | | | Add changelogAndrew Morgan2019-09-101-1/+1
| * | | | | | | Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-101-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fixAndrew Morgan2020-02-252-2/+2
|\| | | | | |
| * | | | | | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
| * | | | | | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
* | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2020-02-255-162/+305
|\| | | | | |
| * | | | | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2019-09-065-162/+306
* | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2020-02-251-5/+7
|\| | | | | |
| * | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-6/+7
* | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2020-02-251-0/+33
|\| | | | | |
| * | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-0/+33
| | |_|_|_|/ | |/| | | |
* | | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2020-02-251-2/+0
|\| | | | |
| * | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-2/+0
* | | | | | Ensure the list media admin API is always available (#5966)Andrew Morgan2020-02-251-2/+5
|\| | | | |
| * | | | | Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-031-2/+5
* | | | | | Ensure an auth instance is available to ListMediaInRoom (#5967)Andrew Morgan2020-02-251-0/+1
|\| | | | |
| * | | | | Ensure an auth instance is available to ListMediaInRoom (#5967)Travis Ralston2019-09-031-0/+1
* | | | | | Remove double return statements (#5962)Andrew Morgan2020-02-253-4/+0
|\| | | | |
| * | | | | Remove double return statements (#5962)Andrew Morgan2019-09-033-4/+0
* | | | | | Opentrace device lists (#5853)Andrew Morgan2020-02-252-2/+6
|\| | | | |
| * | | | | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-2/+6
* | | | | | fix thumbnail storage location (#5915)Andrew Morgan2020-02-241-1/+1
|\| | | | |
| * | | | | fix thumbnail storage location (#5915)L0ric02019-09-021-1/+1
* | | | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2020-02-241-6/+1
|\| | | | |
| * | | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-6/+1
* | | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-2437-182/+182
|\| | | | |
| * | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3037-182/+182
| * | | | | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-1/+6
| | |_|_|/ | |/| | |
* | | | | Add m.id_access_token flag (#5930)Andrew Morgan2020-02-241-1/+6
* | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-241-4/+2
* | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-241-2/+4
|\| | | |
* | | | | Merge pull request #5914 from matrix-org/rei/admin_getadminAndrew Morgan2020-02-212-9/+33
|\| | | |
| * | | | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-282-9/+33
| |\ \ \ \
| | * | | | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-272-9/+33
* | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyAndrew Morgan2020-02-211-13/+15
|\| | | | |
| * | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-271-13/+15
| |\ \ \ \ \
| | * | | | | Fixup review commentsErik Johnston2019-08-231-2/+2
| | * | | | | Only sign when we respond to remote key requestsErik Johnston2019-08-211-13/+15
* | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlAndrew Morgan2020-02-211-1/+1
|\| | | | | |
| * | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-271-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | public_base_url is actually public_baseurlAaron Raimist2019-08-261-1/+1
* | | | | | | Add Admin API capability to set adminship of a user (#5878)Andrew Morgan2020-02-212-0/+78
|\| | | | | |
| * | | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-272-0/+78
| |/ / / / /
* | | | | | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis...Andrew Morgan2020-02-211-51/+4
|\| | | | |
| * | | | | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis...Richard van der Hoff2019-08-221-53/+4
| |\ \ \ \ \
| | * | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-53/+4
| | |/ / / /
| * | | | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-221-4/+1
| * | | | | Add "require_consent" parameter for registrationHalf-Shot2019-08-221-1/+4
* | | | | | Opentrace e2e keys (#5855)Andrew Morgan2020-02-211-1/+12
|\| | | | |
| * | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-1/+12
* | | | | | Servlet to purge old rooms (#5845)Andrew Morgan2020-02-212-0/+59
|\| | | | |
| * | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-222-0/+59
| |/ / / /
* | | | | Fix up password reset template config names (#5863)Andrew Morgan2020-02-201-2/+2
|\| | | |
| * | | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-2/+2
| |/ / /
* | | | Don't load the media repo when configured to use an external media repo (#5754)Andrew Morgan2020-02-204-91/+143
|\| | |
| * | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-134-91/+143
* | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2020-02-201-3/+11
|\| | |
| * | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-3/+11
* | | | Account validity: allow defining HTML templates to serve the us… (#5807)Andrew Morgan2020-02-201-3/+3
|\| | |
| * | | LintBrendan Abolivier2019-08-011-4/+2
| * | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+17
| | |/ | |/|
| * | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-243-9/+39
| |\ \
* | \ \ Fix servlet metric names (#5734)Andrew Morgan2020-02-193-9/+39
|\ \ \ \ | | |/ / | |/| |
| * | | Fix servlet metric names (#5734)Jorik Schellekens2019-07-243-9/+39
| | |/ | |/|
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-1939-288/+270
|\ \ \ | | |/ | |/|
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2339-288/+270
| |/
* | Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2020-02-191-32/+43
|\|
| * Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-181-32/+43
* | Implement access token expiry (#5660)Andrew Morgan2020-02-171-1/+1
|\|
| * fix typo: backgroud -> backgroundAndrew Morgan2019-07-121-1/+1
* | Clean up exception handling for access_tokens (#5656)Andrew Morgan2020-02-172-4/+15
|\|
| * Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-112-4/+15
* | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2020-02-171-2/+12
|\|
| * Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
* | Include the original event in /relations (#5626)Andrew Morgan2020-02-171-3/+5
|\|
| * Include the original event in /relations (#5626)Andrew Morgan2019-07-091-3/+5
* | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-173-18/+10
|\|
| * Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-083-18/+10
* | Factor out some redundant code in the login impl (#5639)Andrew Morgan2020-02-171-39/+10
|\|
| * Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
* | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-141-4/+3
* | Fix account_validity incorrect email response contentAndrew Morgan2020-02-141-2/+5
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-146-18/+14
|\|
| * Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-046-18/+14
* | Fix media repo breaking (#5593)Andrew Morgan2020-02-141-0/+1
|\|
| * Fix media repo breaking (#5593)Amber Brown2019-07-021-0/+1
* | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-142-43/+48
|\|
| * Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-022-43/+48
| |\
| | * Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-019-122/+75
| | |\
| | * | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | * | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-262-44/+4
| | * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-2657-1432/+1275
| | |\ \
| | * | | Code cleanups and simplifications.Richard van der Hoff2019-06-112-45/+42
| | * | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-1039-321/+531
| | |\ \ \
| | * | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-021-0/+46
* | | | | | Fix JWT login with new users (#5586)Andrew Morgan2020-02-141-6/+3
|\| | | | |
| * | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-6/+3
* | | | | | fix async/await consentresource (#5585)Andrew Morgan2020-02-141-1/+3
|\| | | | |
| * | | | | fix async/await consentresource (#5585)Amber Brown2019-07-011-1/+3
| | |_|_|/ | |/| | |
* | | | | Make the http server handle coroutine-making REST servlets (#5475)Andrew Morgan2020-02-148-120/+73
|\| | | |
| * | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-298-120/+73
* | | | | Fix JWT login (#5555)Andrew Morgan2020-02-141-1/+1
|\| | | |
| * | | | Fix JWT login (#5555)PauRE2019-06-271-1/+1
| | |_|/ | |/| |
| * | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
* | | | Run Black. (#5482)Andrew Morgan2020-02-133-13/+13
|\| | |
| * | | Run Black. (#5482)Amber Brown2019-06-2057-1426/+1254
* | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1157-1476/+1291
* | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-107-24/+174
|\ \ \ \
| * | | | Fix resetting password via a phone number (#21) dinsic_2020-02-10Andrew Morgan2020-01-241-1/+1
| * | | | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-222-1/+19
| * | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-121-2/+3
| * | | | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-021-16/+58
| * | | | Add a /user/:user_id/info servlet to give user deactivated/expired informatio...Andrew Morgan2019-11-141-0/+89
| * | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-012-1/+3
| * | | | Revert "Merge pull request #5932 from matrix-org/babolivier/account_validity_...Brendan Abolivier2019-09-091-3/+1
| * | | | Revert "Ensure the password reset template is correctly converted to binary"Brendan Abolivier2019-09-091-2/+1
| * | | | Ensure the password reset template is correctly converted to binaryBrendan Abolivier2019-09-091-1/+2
* | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileAndrew Morgan2020-02-101-2/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileErik Johnston2019-06-141-2/+4
| |\ \ \ \
| | * | | | Don't log exception when failing to fetch remote content.Erik Johnston2019-06-071-2/+4
* | | | | | Remove Python 2.7 support. (#5425)Andrew Morgan2020-02-101-4/+15
|\| | | | | | |_|/ / / |/| | | |
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-111-4/+5
| |\ \ \ \
| * | | | | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-111-4/+15
| | |_|_|/ | |/| | |
| * | | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai...Brendan Abolivier2019-06-101-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Fix encoding for account validity HTML files on Python 2Brendan Abolivier2019-08-291-1/+3
* | | | | LintBrendan Abolivier2019-08-011-1/+1
* | | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+15
* | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
* | | | | LintBrendan Abolivier2019-06-121-1/+0
* | | | | Fix path for password policy endpointsBrendan Abolivier2019-06-121-2/+2
* | | | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-1241-345/+558
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Change password reset links to /_matrix.Erik Johnston2019-06-111-4/+5
| |/ / /
| * | | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-061-5/+238
| * | | Neilj/add r0.5 to versions (#5360)Neil Johnson2019-06-051-0/+1
| * | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se...Richard van der Hoff2019-06-041-10/+2
| |\ \ \
| | * | | Notary server: make requests to origins in parallelRichard van der Hoff2019-06-041-10/+2
| * | | | Hawkowl/fix missing auth (#5328)Amber Brown2019-06-041-0/+1
| |/ / /
| * | / Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0337-305/+287
| | |/ | |/|
| * | Fix ignored filter field in `/messages` endpointEisha Chen-yen-su2019-05-301-0/+2
| * | Merge pull request #5256 from aaronraimist/logout-correct-errorErik Johnston2019-05-301-18/+9
| |\ \
| | * | LintAaron Raimist2019-05-291-2/+0
| | * | Get rid of try exceptAaron Raimist2019-05-271-16/+9
| | * | Show correct error when logging out and access token is missingAaron Raimist2019-05-241-4/+4
| * | | Implement the SHHS complexity API (#5216)Amber Brown2019-05-301-3/+9
| * | | Serve CAS login over r0 (#5286)Amber Brown2019-05-301-2/+2
| * | | Fix error when downloading thumbnail with width/height param missing (#5258)Aaron Raimist2019-05-291-2/+2
| |/ /
| * | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-241-0/+3
| |\ \