| Commit message (Expand) | Author | Age | Files | Lines |
* | Hash passwords earlier in the password reset process (#7538) | Patrick Cloke | 2020-05-20 | 3 | -7/+31 |
* | Merge tag 'v1.13.0rc3' into develop | Patrick Cloke | 2020-05-18 | 2 | -24/+28 |
|\ |
|
| * | Hash passwords earlier in the registration process (#7523) | Patrick Cloke | 2020-05-18 | 2 | -24/+28 |
* | | Merge pull request #7519 from matrix-org/rav/kill_py2_code | Richard van der Hoff | 2020-05-18 | 1 | -18/+9 |
|\ \ |
|
| * | | remove miscellaneous PY2 code | Richard van der Hoff | 2020-05-15 | 1 | -18/+9 |
* | | | Support UI Authentication for OpenID Connect accounts (#7457) | Patrick Cloke | 2020-05-15 | 2 | -16/+34 |
|/ / |
|
* | | Allow expired accounts to logout (#7443) | Andrew Morgan | 2020-05-14 | 1 | -3/+3 |
* | | Merge tag 'v1.13.0rc2' into develop | Richard van der Hoff | 2020-05-14 | 1 | -1/+0 |
|\| |
|
| * | Do not validate that the client dict is stable during UI Auth. (#7483) | Patrick Cloke | 2020-05-13 | 1 | -1/+0 |
* | | Merge branch 'release-v1.13.0' into develop | Andrew Morgan | 2020-05-11 | 1 | -0/+1 |
|\| |
|
| * | Rework UI Auth session validation for registration (#7455) | Patrick Cloke | 2020-05-08 | 1 | -0/+1 |
* | | Implement OpenID Connect-based login (#7256) | Quentin Gliech | 2020-05-08 | 3 | -3/+83 |
* | | Add room details admin endpoint (#7317) | Manuel Stahl | 2020-05-07 | 2 | -1/+27 |
|/ |
|
* | Persist user interactive authentication sessions (#7302) | Patrick Cloke | 2020-04-30 | 2 | -4/+4 |
* | Return total number of users and profile attributes in admin users endpoint (... | Manuel Stahl | 2020-04-28 | 1 | -4/+4 |
* | Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t... | Brendan Abolivier | 2020-04-23 | 2 | -2/+27 |
* | Extend room admin api with additional attributes (#7225) | Dirk Klimpel | 2020-04-22 | 1 | -1/+14 |
* | Merge branch 'release-v1.12.4' into develop | Richard van der Hoff | 2020-04-22 | 1 | -0/+8 |
|\ |
|
| * | Support GET account_data requests on a worker (#7311) | Richard van der Hoff | 2020-04-21 | 1 | -0/+8 |
* | | Reduce logging verbosity of URL cache cleanup. (#7295) | Michael Kaye | 2020-04-22 | 1 | -2/+7 |
* | | Use a template for the SSO success page to allow for customization. (#7279) | Patrick Cloke | 2020-04-17 | 1 | -1/+24 |
* | | Allow specifying the value of Accept-Language header for URL previews (#7265) | Andrew Morgan | 2020-04-15 | 1 | -2/+6 |
* | | Improve error responses when a remote server doesn't allow you to access its ... | Andrew Morgan | 2020-04-06 | 1 | -13/+20 |
* | | Support CAS in UI Auth flows. (#7186) | Patrick Cloke | 2020-04-03 | 2 | -9/+39 |
* | | Support SAML in the user interactive authentication workflow. (#7102) | Patrick Cloke | 2020-04-01 | 5 | -30/+50 |
* | | Admin API to join users to a room. (#7051) | Dirk Klimpel | 2020-03-27 | 2 | -4/+82 |
* | | Add options to prevent users from changing their profile. (#7096) | Dirk Klimpel | 2020-03-27 | 1 | -0/+16 |
* | | Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150) | Andrew Morgan | 2020-03-27 | 1 | -1/+1 |
* | | Refactor the CAS code (move the logic out of the REST layer to a handler) (#7... | Patrick Cloke | 2020-03-26 | 1 | -155/+16 |
* | | Allow server admins to define and enforce a password policy (MSC2000). (#7118) | Dirk Klimpel | 2020-03-26 | 3 | -0/+62 |
* | | Validate that the session is not modified during UI-Auth (#7068) | Patrick Cloke | 2020-03-26 | 4 | -8/+14 |
* | | Fix CAS redirect url (#6634) | Naugrimm | 2020-03-24 | 1 | -11/+16 |
* | | Set Referrer-Policy to no-referrer for media (#7009) | Dionysis Grigoropoulos | 2020-03-23 | 1 | -0/+3 |
* | | Clean-up some auth/login REST code (#7115) | Patrick Cloke | 2020-03-20 | 2 | -41/+20 |
* | | Convert some of the media REST code to async/await (#7110) | Patrick Cloke | 2020-03-20 | 3 | -111/+90 |
|/ |
|
* | Add an option to the set password API to choose whether to logout other devic... | Patrick Cloke | 2020-03-18 | 2 | -3/+8 |
* | Set charset to utf-8 when adding headers for certain text content types (#7044) | The Stranjer | 2020-03-17 | 1 | -1/+24 |
* | Remove special casing of `m.room.aliases` events (#7034) | Patrick Cloke | 2020-03-17 | 1 | -12/+0 |
* | Revert "Add options to disable setting profile info for prevent changes. (#70... | Richard van der Hoff | 2020-03-17 | 1 | -16/+0 |
* | Add options to disable setting profile info for prevent changes. (#7053) | Brendan Abolivier | 2020-03-10 | 1 | -0/+16 |
|\ |
|
| * | updates after review | dklimpel | 2020-03-09 | 1 | -6/+12 |
| * | add disable_3pid_changes | dklimpel | 2020-03-08 | 1 | -0/+10 |
* | | SAML2: render a comprehensible error page if something goes wrong | Brendan Abolivier | 2020-03-10 | 1 | -1/+17 |
* | | Convert remote key resource REST layer to async/await. (#7020) | Patrick Cloke | 2020-03-05 | 1 | -7/+4 |
* | | Merge branch 'master' into develop | Brendan Abolivier | 2020-03-03 | 1 | -30/+13 |
|\ \
| |/
|/| |
|
| * | Factor out complete_sso_login and expose it to the Module API | Brendan Abolivier | 2020-03-03 | 1 | -56/+2 |
| * | Add a whitelist for the SSO confirmation step. | Richard van der Hoff | 2020-03-02 | 1 | -8/+18 |
| * | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1 | Richard van der Hoff | 2020-03-02 | 1 | -4/+2 |
| |\ |
|
| | * | Fixed set a user as an admin with the new API (#6928) | Dirk Klimpel | 2020-03-02 | 1 | -4/+2 |
| * | | Add a confirmation step to the SSO login flow | Brendan Abolivier | 2020-03-02 | 1 | -6/+34 |
| |/ |
|
* | | Fixed set a user as an admin with the new API (#6928) | Dirk Klimpel | 2020-02-28 | 1 | -4/+2 |
* | | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error hand... | Andrew Morgan | 2020-02-26 | 2 | -4/+8 |
* | | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957) | Patrick Cloke | 2020-02-21 | 6 | -30/+28 |
|/ |
|
* | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekable | Richard van der Hoff | 2020-02-19 | 1 | -6/+6 |
|\ |
|
| * | Add `allow_departed_users` param to `check_in_room_or_world_readable` | Richard van der Hoff | 2020-02-19 | 1 | -6/+6 |
* | | Move MSC2432 stuff onto unstable prefix (#6948) | Richard van der Hoff | 2020-02-19 | 2 | -1/+9 |
|/ |
|
* | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939) | Richard van der Hoff | 2020-02-18 | 1 | -0/+23 |
* | Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 (#... | Aaron Raimist | 2020-02-13 | 1 | -1/+0 |
* | Return a 404 for admin api user lookup if user not found (#6901) | Andrew Morgan | 2020-02-12 | 1 | -1/+4 |
* | Admin api to add an email address (#6789) | Dirk Klimpel | 2020-02-07 | 1 | -0/+39 |
* | Allow URL-encoded user IDs on user admin api paths (#6825) | Andrew Morgan | 2020-02-03 | 1 | -2/+2 |
* | MSC2260: Block direct sends of m.room.aliases events (#6794) | Richard van der Hoff | 2020-01-30 | 1 | -0/+12 |
* | Add `rooms.room_version` column (#6729) | Erik Johnston | 2020-01-27 | 1 | -1/+2 |
* | Validate client_secret parameter (#6767) | Andrew Morgan | 2020-01-24 | 2 | -5/+21 |
* | a bit of debugging for media storage providers (#6757) | Richard van der Hoff | 2020-01-23 | 2 | -0/+7 |
* | Minor fixes to user admin api (#6761) | Richard van der Hoff | 2020-01-23 | 1 | -9/+5 |
* | Remove unnecessary abstractions in admin handler (#6751) | Andrew Morgan | 2020-01-22 | 1 | -10/+9 |
* | Admin API to list, filter and sort rooms (#6720) | Andrew Morgan | 2020-01-22 | 4 | -2/+100 |
* | Fix typo in _select_thumbnail | Brendan Abolivier | 2020-01-22 | 1 | -1/+1 |
* | Fix and add test to deprecated quarantine media admin api (#6756) | Andrew Morgan | 2020-01-22 | 1 | -1/+1 |
* | Fixup synapse.rest to pass mypy (#6732) | Erik Johnston | 2020-01-20 | 9 | -33/+45 |
* | Fix `/events/:event_id` deprecated API. (#6731) | Erik Johnston | 2020-01-20 | 1 | -1/+1 |
* | Fix changing password via user admin API. (#6730) | Erik Johnston | 2020-01-20 | 1 | -2/+2 |
* | Merge pull request #6714 from matrix-org/babolivier/retention_select_event | Brendan Abolivier | 2020-01-17 | 1 | -1/+1 |
|\ |
|
| * | Remove get_room_event_after_stream_ordering entirely | Brendan Abolivier | 2020-01-16 | 1 | -1/+1 |
* | | Add org.matrix.e2e_cross_signing to unstable_features in /versions as per MSC... | Neil Johnson | 2020-01-16 | 1 | -0/+2 |
* | | Remove duplicate session check in web fallback servlet (#6702) | Andrew Morgan | 2020-01-15 | 1 | -4/+0 |
|/ |
|
* | Quarantine media by ID or user ID (#6681) | Andrew Morgan | 2020-01-13 | 1 | -2/+66 |
* | Allow admin users to create or modify users without a shared secret (#6495) | Manuel Stahl | 2020-01-09 | 2 | -0/+144 |
* | Back out ill-advised notary server hackery (#6657) | Richard van der Hoff | 2020-01-08 | 1 | -22/+8 |
* | Workaround for error when fetching notary's own key (#6620) | Richard van der Hoff | 2020-01-06 | 1 | -8/+22 |
* | Remove unused, undocumented "content repo" resource (#6628) | Richard van der Hoff | 2020-01-03 | 2 | -103/+0 |
* | Clean up startup for the pusher (#6558) | Richard van der Hoff | 2019-12-18 | 1 | -17/+16 |
* | Back out change preventing setting null avatar URLs | Erik Johnston | 2019-12-11 | 1 | -6/+6 |
* | Better errors regarding changing avatar_url (#6497) | Andrew Morgan | 2019-12-09 | 1 | -3/+8 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab... | Erik Johnston | 2019-12-06 | 35 | -727/+509 |
|\ |
|
| * | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) | Manuel Stahl | 2019-12-05 | 2 | -56/+31 |
| * | Port rest.client.v2 | Erik Johnston | 2019-12-05 | 23 | -505/+361 |
| * | Port rest/v1 to async/await | Erik Johnston | 2019-12-05 | 10 | -166/+117 |
* | | Move background update handling out of store | Erik Johnston | 2019-12-05 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 10 | -582/+752 |
|\ |
|
| * | Fix: Pillow error when uploading RGBA image (#3325) (#6241) | Filip Štědronský | 2019-12-02 | 1 | -1/+4 |
| * | Add User-Interactive Auth to /account/3pid/add (#6119) | Andrew Morgan | 2019-11-29 | 1 | -0/+5 |
| * | MSC2367 Allow reason field on all member events | Erik Johnston | 2019-11-28 | 1 | -1/+1 |
| * | add etag and count to key backup endpoints (#5858) | Hubert Chathi | 2019-11-27 | 1 | -4/+4 |
| * | Fix startup error when http proxy is defined. (#6421) | Richard van der Hoff | 2019-11-26 | 1 | -2/+2 |
| * | Clean up newline quote marks around the codebase (#6362) | Andrew Morgan | 2019-11-21 | 1 | -1/+1 |
| * | Move admin endpoints into separate files (#6308) | Manuel Stahl | 2019-11-20 | 4 | -555/+621 |
| * | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanups | Brendan Abolivier | 2019-11-20 | 1 | -17/+94 |
| |\ |
|
| | * | Lint | Brendan Abolivier | 2019-11-20 | 1 | -1/+3 |
| | * | Apply suggestions from code review | Erik Johnston | 2019-11-18 | 1 | -1/+1 |
| | * | Only do `rc_login` ratelimiting on succesful login. | Erik Johnston | 2019-11-06 | 1 | -18/+93 |
| * | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2 | Richard van der Hoff | 2019-11-05 | 1 | -1/+2 |
| |\ \ |
|
| | * | | Fix exception when OpenGraph tag values are ints | Richard van der Hoff | 2019-11-05 | 1 | -1/+2 |
| * | | | Merge branch 'develop' into rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 13 | -159/+146 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| * | | Apply suggestions from code review | Richard van der Hoff | 2019-11-05 | 1 | -1/+1 |
| * | | Strip overlong OpenGraph data from url preview | Richard van der Hoff | 2019-11-05 | 1 | -1/+19 |
* | | | Update copyrights | Brendan Abolivier | 2019-11-05 | 1 | -0/+3 |
| |/
|/| |
|
* | | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Brendan Abolivier | 2019-11-01 | 1 | -0/+3 |
|\ \ |
|
| * | | Add unstable feature flag | Brendan Abolivier | 2019-11-01 | 1 | -0/+3 |
* | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 2 | -1/+3 |
* | | | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 4 | -11/+12 |
* | | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 8 | -30/+32 |
* | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_await | Erik Johnston | 2019-10-30 | 2 | -15/+9 |
|\ \ \ |
|
| * | | | Port receipt and read markers to async/wait | Erik Johnston | 2019-10-29 | 2 | -15/+9 |
| |/ / |
|
* / / | Port room rest handlers to async/await | Erik Johnston | 2019-10-29 | 1 | -94/+72 |
|/ / |
|
* | | Address codestyle concerns | Michael Kaye | 2019-10-24 | 2 | -2/+9 |
* | | Delay printf until logging is required. | Michael Kaye | 2019-10-24 | 2 | -9/+9 |
|/ |
|
* | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 17 | -346/+585 |
|\ |
|
| * | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 17 | -346/+585 |
| |\ |
|
| | * | Merge pull request #6196 from matrix-org/erikj/await | Erik Johnston | 2019-10-18 | 5 | -114/+84 |
| | |\ |
|
| | | * | Port synapse/rest/client/_base.py to async/await | Erik Johnston | 2019-10-11 | 1 | -9/+5 |
| | | * | Add maybe_awaitable and fix __init__ bugs | Erik Johnston | 2019-10-11 | 1 | -2/+5 |
| | | * | Port synaps/rest/client/users.py to async/await | Erik Johnston | 2019-10-11 | 1 | -11/+7 |
| | | * | Port synaps/rest/client/server_notice_servlet.py to async/await | Erik Johnston | 2019-10-11 | 1 | -6/+3 |
| | | * | Port synaps/rest/client/media.py to async/await | Erik Johnston | 2019-10-11 | 1 | -16/+11 |
| | | * | Port rest/admin/__init__.py to async/await | Erik Johnston | 2019-10-11 | 1 | -72/+55 |
| | * | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Hubert Chathi | 2019-10-11 | 1 | -1/+1 |
| | |\ \ |
|
| | | * | | make version optional in body of e2e backup version update | Hubert Chathi | 2019-10-09 | 1 | -1/+1 |
| | * | | | cas: support setting display name (#6114) | Valérian Rousset | 2019-10-11 | 1 | -1/+3 |
| | | |/
| | |/| |
|
| | * | | Fix store_url_cache using bytes | Erik Johnston | 2019-10-10 | 1 | -2/+2 |
| | * | | send 404 as http-status when filter-id is unknown to the server (#2380) | krombel | 2019-10-10 | 2 | -22/+31 |
| | |/ |
|
| | * | add M_TOO_LARGE error code for uploading a too large file (#6151) | Anshul Angaria | 2019-10-08 | 1 | -2/+6 |
| | * | Log responder we are using. (#6139) | Michael Kaye | 2019-10-07 | 1 | -1/+1 |
| | * | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142) | Robert Swain | 2019-10-04 | 1 | -3/+11 |
| | * | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 1 | -0/+8 |
| | * | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span | Erik Johnston | 2019-09-27 | 1 | -0/+18 |
| | |\ |
|
| | | * | isort | Erik Johnston | 2019-09-25 | 1 | -1/+1 |
| | | * | Add tags for event_id and txn_id in event sending | Erik Johnston | 2019-09-25 | 1 | -0/+18 |
| | * | | Kill off half-implemented password-reset via sms (#6101) | Richard van der Hoff | 2019-09-26 | 1 | -64/+1 |
| | * | | Stop advertising unsupported flows for registration (#6107) | Richard van der Hoff | 2019-09-25 | 1 | -3/+29 |
| | * | | Refactor code for calculating registration flows (#6106) | Richard van der Hoff | 2019-09-25 | 1 | -62/+62 |
| | |/ |
|
| | * | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 3 | -75/+316 |
| | |\ |
|
| | | * | Add an unstable feature flag for separate add/bind 3pid APIs (#6044) | Andrew Morgan | 2019-09-23 | 1 | -0/+2 |
| | | * | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974) | Andrew Morgan | 2019-09-23 | 1 | -0/+3 |
| | | * | Add m.require_identity_server to /versions unstable_flags (#5972) | Andrew Morgan | 2019-09-23 | 1 | -1/+13 |
| | | * | Add POST submit_token endpoint for MSISDN (#6078) | Andrew Morgan | 2019-09-23 | 1 | -2/+45 |
| | | * | Implement MSC2290 (#6043) | Andrew Morgan | 2019-09-23 | 2 | -72/+95 |
| | | * | Disable /register/available if registration is disabled (#6082) | Andrew Morgan | 2019-09-23 | 1 | -0/+5 |
| | | * | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2019-09-20 | 2 | -51/+225 |
| | | * | Remove trailing slash ability from password reset's submit_token endpoint (#6... | Andrew Morgan | 2019-09-20 | 1 | -1/+1 |
| | | * | Drop support for bind param on POST /account/3pid (MSC2290) (#6067) | Andrew Morgan | 2019-09-20 | 1 | -4/+0 |
| | | * | Use unstable prefix for 3PID unbind API (#6062) | J. Ryan Stinnett | 2019-09-19 | 1 | -1/+1 |
| | | * | Remove POST method from password reset submit_token endpoint (#6056) | Andrew Morgan | 2019-09-19 | 1 | -17/+0 |
| | * | | Merge branch 'develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-19 | 44 | -425/+732 |
| | |\| |
|
| | | * | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2019-09-11 | 1 | -0/+1 |
| | | * | Add changelog | Andrew Morgan | 2019-09-10 | 1 | -1/+1 |
| | | * | Use account_threepid_delegate for 3pid validation | Andrew Morgan | 2019-09-10 | 1 | -1/+2 |
| | * | | Record mappings from saml users in an external table | Richard van der Hoff | 2019-09-13 | 1 | -0/+14 |
| * | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 5 | -168/+346 |
| |\ \ \
| | | |/
| | |/| |
|
* | | | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 5 | -168/+346 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Apply suggestions from code review | Andrew Morgan | 2019-09-06 | 2 | -2/+2 |
| * | | | Fix destructuring assumption bug | Andrew Morgan | 2019-09-06 | 2 | -2/+2 |
| * | | | Allow Synapse to send registration emails + choose Synapse or an external ser... | Andrew Morgan | 2019-09-06 | 5 | -162/+306 |
| * | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2019-09-05 | 1 | -6/+7 |
| * | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2019-09-05 | 1 | -0/+33 |
* | | | | update with newer coding style | Hubert Chathi | 2019-09-04 | 1 | -2/+2 |
* | | | | make black happy | Hubert Chathi | 2019-09-04 | 1 | -0/+1 |
* | | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 1 | -1/+1 |
* | | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 1 | -0/+50 |
| |/ /
|/| | |
|
* | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 39 | -193/+195 |
|\| | |
|
| * | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2019-09-04 | 1 | -2/+0 |
| * | | Ensure the list media admin API is always available (#5966) | Travis Ralston | 2019-09-03 | 1 | -2/+5 |
| * | | Ensure an auth instance is available to ListMediaInRoom (#5967) | Travis Ralston | 2019-09-03 | 1 | -0/+1 |
| * | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 3 | -4/+0 |
| * | | Opentrace device lists (#5853) | Jorik Schellekens | 2019-09-03 | 2 | -2/+6 |
| * | | fix thumbnail storage location (#5915) | L0ric0 | 2019-09-02 | 1 | -1/+1 |
| * | | Revert "Add m.id_access_token flag (#5930)" (#5945) | Andrew Morgan | 2019-08-30 | 1 | -6/+1 |
| * | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 37 | -182/+182 |
| * | | Add m.id_access_token flag (#5930) | Andrew Morgan | 2019-08-30 | 1 | -1/+6 |
* | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 13 | -173/+367 |
|\| | |
|
| * | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | reivilibre | 2019-08-28 | 2 | -9/+33 |
| |\ \ |
|
| | * | | Add GET method to admin API /users/@user:dom/admin | Olivier Wilkinson (reivilibre) | 2019-08-27 | 2 | -9/+33 |
| * | | | Merge pull request #5895 from matrix-org/erikj/notary_key | Erik Johnston | 2019-08-27 | 1 | -13/+15 |
| |\ \ \ |
|
| | * | | | Fixup review comments | Erik Johnston | 2019-08-23 | 1 | -2/+2 |
| | * | | | Only sign when we respond to remote key requests | Erik Johnston | 2019-08-21 | 1 | -13/+15 |
| * | | | | Merge pull request #5909 from aaronraimist/public_base_url | Richard van der Hoff | 2019-08-27 | 1 | -1/+1 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | public_base_url is actually public_baseurl | Aaron Raimist | 2019-08-26 | 1 | -1/+1 |
| * | | | | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 2 | -0/+78 |
| |/ / / |
|
| * | | | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis... | Richard van der Hoff | 2019-08-22 | 1 | -53/+4 |
| |\ \ \ |
|
| | * | | | Remove shared secret registration from client/r0/register endpoint | Manuel Stahl | 2019-08-22 | 1 | -53/+4 |
| | |/ / |
|
| * | | | Revert "Add "require_consent" parameter for registration" | Brendan Abolivier | 2019-08-22 | 1 | -4/+1 |
| * | | | Add "require_consent" parameter for registration | Half-Shot | 2019-08-22 | 1 | -1/+4 |
| * | | | Opentrace e2e keys (#5855) | Jorik Schellekens | 2019-08-22 | 1 | -1/+12 |
| * | | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 2 | -0/+59 |
| |/ / |
|
| * / | Fix up password reset template config names (#5863) | Andrew Morgan | 2019-08-15 | 1 | -2/+2 |
| |/ |
|
| * | Don't load the media repo when configured to use an external media repo (#5754) | Amber Brown | 2019-08-13 | 4 | -91/+143 |
| * | Return 404 instead of 403 when retrieving an event without perms (#5798) | Andrew Morgan | 2019-08-06 | 1 | -3/+11 |
| * | Lint | Brendan Abolivier | 2019-08-01 | 1 | -4/+2 |
| * | Allow defining HTML templates to serve the user on account renewal | Brendan Abolivier | 2019-08-01 | 1 | -6/+17 |
* | | apply PR review suggestions | Hubert Chathi | 2019-08-21 | 1 | -1/+1 |
* | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 39 | -297/+309 |
|\| |
|
| * | Merge tag 'v1.2.0rc2' into develop | Andrew Morgan | 2019-07-24 | 3 | -9/+39 |
| |\ |
|
| | * | Fix servlet metric names (#5734) | Jorik Schellekens | 2019-07-24 | 3 | -9/+39 |
| * | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 39 | -288/+270 |
| |/ |
|
* / | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 1 | -3/+43 |
|/ |
|
* | Remove the ability to query relations when the original event was redacted. (... | Andrew Morgan | 2019-07-18 | 1 | -32/+43 |
* | fix typo: backgroud -> background | Andrew Morgan | 2019-07-12 | 1 | -1/+1 |
* | Clean up exception handling for access_tokens (#5656) | Richard van der Hoff | 2019-07-11 | 2 | -4/+15 |
* | Don't bundle aggregations when retrieving the original event (#5654) | Andrew Morgan | 2019-07-10 | 1 | -2/+12 |
* | Include the original event in /relations (#5626) | Andrew Morgan | 2019-07-09 | 1 | -3/+5 |
* | Remove access-token support from RegistrationHandler.register (#5641) | Richard van der Hoff | 2019-07-08 | 3 | -18/+10 |
* | Factor out some redundant code in the login impl (#5639) | Richard van der Hoff | 2019-07-08 | 1 | -39/+10 |
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 6 | -18/+14 |
* | Fix media repo breaking (#5593) | Amber Brown | 2019-07-02 | 1 | -0/+1 |
* | Complete the SAML2 implementation (#5422) | Richard van der Hoff | 2019-07-02 | 2 | -43/+48 |
|\ |
|
| * | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-07-01 | 9 | -122/+75 |
| |\ |
|
| * | | rename BaseSSORedirectServlet for consistency | Richard van der Hoff | 2019-06-27 | 1 | -3/+3 |
| * | | Move all the saml stuff out to a centralised handler | Richard van der Hoff | 2019-06-26 | 2 | -44/+4 |
| * | | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-06-26 | 57 | -1432/+1275 |
| |\ \ |
|
| * | | | Code cleanups and simplifications. | Richard van der Hoff | 2019-06-11 | 2 | -45/+42 |
| * | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_client | Richard van der Hoff | 2019-06-10 | 39 | -321/+531 |
| |\ \ \ |
|
| * | | | | SAML2 Improvements and redirect stuff | Alexander Trost | 2019-06-02 | 1 | -0/+46 |
* | | | | | Fix JWT login with new users (#5586) | PauRE | 2019-07-02 | 1 | -6/+3 |
* | | | | | fix async/await consentresource (#5585) | Amber Brown | 2019-07-01 | 1 | -1/+3 |
| |_|_|/
|/| | | |
|
* | | | | Make the http server handle coroutine-making REST servlets (#5475) | Amber Brown | 2019-06-29 | 8 | -120/+73 |
* | | | | Fix JWT login (#5555) | PauRE | 2019-06-27 | 1 | -1/+1 |
| |_|/
|/| | |
|
* | | | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 1 | -1/+1 |
* | | | Run Black. (#5482) | Amber Brown | 2019-06-20 | 57 | -1426/+1254 |
* | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file | Erik Johnston | 2019-06-14 | 1 | -2/+4 |
|\ \ \ |
|
| * | | | Don't log exception when failing to fetch remote content. | Erik Johnston | 2019-06-07 | 1 | -2/+4 |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 1 | -4/+5 |
|\ \ \ \ |
|
| * | | | | Change password reset links to /_matrix. | Erik Johnston | 2019-06-11 | 1 | -4/+5 |
| |/ / / |
|
* | | / | Don't warn user about password reset disabling through config code (#5387) | Andrew Morgan | 2019-06-11 | 1 | -4/+15 |
| |_|/
|/| | |
|
* | | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai... | Brendan Abolivier | 2019-06-10 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Don't check whether the user's account is expired on /send_mail requests | Brendan Abolivier | 2019-06-05 | 1 | -1/+1 |
* | | | Add ability to perform password reset via email without trusting the identity... | Andrew Morgan | 2019-06-06 | 1 | -5/+238 |
* | | | Neilj/add r0.5 to versions (#5360) | Neil Johnson | 2019-06-05 | 1 | -0/+1 |
* | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se... | Richard van der Hoff | 2019-06-04 | 1 | -10/+2 |
|\ \ \ |
|
| * | | | Notary server: make requests to origins in parallel | Richard van der Hoff | 2019-06-04 | 1 | -10/+2 |
* | | | | Hawkowl/fix missing auth (#5328) | Amber Brown | 2019-06-04 | 1 | -0/+1 |
|/ / / |
|
* | / | Unify v1 and v2 REST client APIs (#5226) | Amber Brown | 2019-06-03 | 37 | -305/+287 |
| |/
|/| |
|
* | | Fix ignored filter field in `/messages` endpoint | Eisha Chen-yen-su | 2019-05-30 | 1 | -0/+2 |
* | | Merge pull request #5256 from aaronraimist/logout-correct-error | Erik Johnston | 2019-05-30 | 1 | -18/+9 |
|\ \ |
|
| * | | Lint | Aaron Raimist | 2019-05-29 | 1 | -2/+0 |
| * | | Get rid of try except | Aaron Raimist | 2019-05-27 | 1 | -16/+9 |
| * | | Show correct error when logging out and access token is missing | Aaron Raimist | 2019-05-24 | 1 | -4/+4 |
* | | | Implement the SHHS complexity API (#5216) | Amber Brown | 2019-05-30 | 1 | -3/+9 |
* | | | Serve CAS login over r0 (#5286) | Amber Brown | 2019-05-30 | 1 | -2/+2 |
* | | | Fix error when downloading thumbnail with width/height param missing (#5258) | Aaron Raimist | 2019-05-29 | 1 | -2/+2 |
|/ / |
|