summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Expand)AuthorAgeFilesLines
* Incorporate reviewBrendan Abolivier2020-08-061-2/+2
* Fix PUT /pushrules to use the right rule IDsBrendan Abolivier2020-08-031-2/+9
* Re-implement unread counts (#7736)Brendan Abolivier2020-07-291-0/+1
* Add an option to disable purge in delete room admin API (#7964)Dirk Klimpel2020-07-281-1/+10
* Convert the remaining media repo code to async / await. (#7947)Patrick Cloke2020-07-275-107/+130
* Support oEmbed for media previews. (#7920)Patrick Cloke2020-07-271-45/+220
* Do not convert async functions to Deferreds in the interactive_auth_handler (...Patrick Cloke2020-07-241-26/+21
* Convert more of the media code to async/await (#7873)Patrick Cloke2020-07-242-33/+42
* Skip serializing /sync response if client has disconnected (#7927)Richard van der Hoff2020-07-221-0/+6
* Add debugging to sync response generation (#7929)Richard van der Hoff2020-07-221-0/+3
* Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-171-1/+10
* Add admin endpoint to get members in a room. (#7842)Michael Albert2020-07-162-0/+27
* Allow moving typing off master (#7869)Erik Johnston2020-07-161-0/+9
* Ensure that calls to `json.dumps` are compatible with the standard library js...Patrick Cloke2020-07-152-7/+10
* Allow accounts to be re-activated from the admin APIs. (#7847)Patrick Cloke2020-07-151-1/+9
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-151-5/+3
* Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-142-109/+50
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-141-6/+19
* `update_membership` declaration: now always returns an event id. (#7809)Richard van der Hoff2020-07-091-4/+2
* Stop passing bytes when dumping JSON (#7799)Patrick Cloke2020-07-081-1/+1
* Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-061-21/+27
* isort 5 compatibility (#7786)Will Hunt2020-07-051-2/+1
* Merge different Resource implementation classes (#7732)Erik Johnston2020-07-039-68/+25
* Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-033-16/+58
* Merge branch 'master' into developPatrick Cloke2020-07-026-53/+22
|\
| * Ensure that HTML pages served from Synapse include headers to avoid embedding.Patrick Cloke2020-07-026-53/+22
* | Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-011-2/+2
* | Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-301-2/+2
* | add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)Sorunome2020-06-241-1/+4
* | Support running multiple media repos. (#7706)Erik Johnston2020-06-171-3/+15
* | Fetch from the r0 media path instead of the unspecced v1. (#7714)Patrick Cloke2020-06-171-4/+4
* | Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-171-2/+2
|\ \
| * \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-151-3/+1
| |\ \
| * \ \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-151-1/+3
| |\ \ \
| * | | | Use temporary prefixes as per the MSCBrendan Abolivier2020-06-101-1/+1
| * | | | Rename dont_push into mark_unreadBrendan Abolivier2020-06-101-2/+2
* | | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-1610-52/+24
* | | | | Merge branch 'master' into developBrendan Abolivier2020-06-161-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Enable 3PID add/bind/unbind endpoints on r0 routesBrendan Abolivier2020-06-151-3/+3
| |/ / /
* | | / Update m.id.phone to use 'phone' instead of 'number' (#7687)Andrew Morgan2020-06-151-2/+10
| |_|/ |/| |
* | | Replace iteritems/itervalues/iterkeys with native versions. (#7692)Patrick Cloke2020-06-151-3/+1
| |/ |/|
* | Remove "user_id" from GET /presence. (#7606)Will Hunt2020-06-111-1/+3
|/
* Fix type information on `assert_*_is_admin` methods (#7645)Richard van der Hoff2020-06-051-19/+14
* Allow new users to be registered via the admin API even if the monthly active...Dirk Klimpel2020-06-051-0/+2
* Add device management to admin API (#7481)Dirk Klimpel2020-06-052-0/+169
* Support CS API v0.6.0 (#6585)Andrew Morgan2020-06-051-15/+1
* Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-052-59/+22
* Fix encryption algorithm typos in tests/comments (#7637)Andrew Morgan2020-06-041-4/+4
* Advertise the token login type when OpenID Connect is enabled. (#7631)Patrick Cloke2020-06-041-8/+3
* Clean up exception handling in SAML2ResponseResource (#7614)Richard van der Hoff2020-06-031-13/+13
* Fix a bug in automatic user creation with m.login.jwt. (#7585)Olof Johansson2020-06-011-7/+8
* Email notifications for new users when creating via the Admin API. (#7267)Dirk Klimpel2020-06-011-0/+16
* Add option to move event persistence off master (#7517)Erik Johnston2020-05-221-2/+9
* Add ability to wait for replication streams (#7542)Erik Johnston2020-05-223-10/+22
* Use a non-empty RelayState for user interactive auth with SAML. (#7552)Patrick Cloke2020-05-221-1/+4
* Hash passwords earlier in the password reset process (#7538)Patrick Cloke2020-05-203-7/+31
* Merge tag 'v1.13.0rc3' into developPatrick Cloke2020-05-182-24/+28
|\
| * Hash passwords earlier in the registration process (#7523)Patrick Cloke2020-05-182-24/+28
* | Merge pull request #7519 from matrix-org/rav/kill_py2_codeRichard van der Hoff2020-05-181-18/+9
|\ \
| * | remove miscellaneous PY2 codeRichard van der Hoff2020-05-151-18/+9
* | | Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-152-16/+34
|/ /
* | Allow expired accounts to logout (#7443)Andrew Morgan2020-05-141-3/+3
* | Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-141-1/+0
|\|
| * Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-131-1/+0
* | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-111-0/+1
|\|
| * Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-081-0/+1
* | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-083-3/+83
* | Add room details admin endpoint (#7317)Manuel Stahl2020-05-072-1/+27
|/
* Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-302-4/+4
* Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-281-4/+4
* Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-232-2/+27
* Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-221-1/+14
* Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-221-0/+8
|\
| * Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-211-0/+8
* | Reduce logging verbosity of URL cache cleanup. (#7295)Michael Kaye2020-04-221-2/+7
* | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-171-1/+24
* | Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-151-2/+6
* | Improve error responses when a remote server doesn't allow you to access its ...Andrew Morgan2020-04-061-13/+20
* | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-032-9/+39
* | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-015-30/+50
* | Admin API to join users to a room. (#7051)Dirk Klimpel2020-03-272-4/+82
* | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+16
* | Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150)Andrew Morgan2020-03-271-1/+1
* | Refactor the CAS code (move the logic out of the REST layer to a handler) (#7...Patrick Cloke2020-03-261-155/+16
* | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-263-0/+62
* | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-264-8/+14
* | Fix CAS redirect url (#6634)Naugrimm2020-03-241-11/+16
* | Set Referrer-Policy to no-referrer for media (#7009)Dionysis Grigoropoulos2020-03-231-0/+3
* | Clean-up some auth/login REST code (#7115)Patrick Cloke2020-03-202-41/+20
* | Convert some of the media REST code to async/await (#7110)Patrick Cloke2020-03-203-111/+90
|/
* Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-182-3/+8
* Set charset to utf-8 when adding headers for certain text content types (#7044)The Stranjer2020-03-171-1/+24
* Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-171-12/+0
* Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-171-16/+0
* Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-101-0/+16
|\
| * updates after reviewdklimpel2020-03-091-6/+12
| * add disable_3pid_changesdklimpel2020-03-081-0/+10
* | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-101-1/+17
* | Convert remote key resource REST layer to async/await. (#7020)Patrick Cloke2020-03-051-7/+4
* | Merge branch 'master' into developBrendan Abolivier2020-03-031-30/+13
|\ \ | |/ |/|
| * Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-031-56/+2
| * Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-021-8/+18
| * Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-021-4/+2
| |\
| | * Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-021-4/+2
| * | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-021-6/+34
| |/
* | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-281-4/+2
* | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error hand...Andrew Morgan2020-02-262-4/+8
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-216-30/+28
|/
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-191-6/+6
|\
| * Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-191-6/+6
* | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-192-1/+9
|/
* Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-181-0/+23
* Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 (#...Aaron Raimist2020-02-131-1/+0
* Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-121-1/+4
* Admin api to add an email address (#6789)Dirk Klimpel2020-02-071-0/+39
* Allow URL-encoded user IDs on user admin api paths (#6825)Andrew Morgan2020-02-031-2/+2
* MSC2260: Block direct sends of m.room.aliases events (#6794)Richard van der Hoff2020-01-301-0/+12
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-271-1/+2
* Validate client_secret parameter (#6767)Andrew Morgan2020-01-242-5/+21
* a bit of debugging for media storage providers (#6757)Richard van der Hoff2020-01-232-0/+7
* Minor fixes to user admin api (#6761)Richard van der Hoff2020-01-231-9/+5
* Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-01-221-10/+9
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-224-2/+100
* Fix typo in _select_thumbnailBrendan Abolivier2020-01-221-1/+1
* Fix and add test to deprecated quarantine media admin api (#6756)Andrew Morgan2020-01-221-1/+1
* Fixup synapse.rest to pass mypy (#6732)Erik Johnston2020-01-209-33/+45
* Fix `/events/:event_id` deprecated API. (#6731)Erik Johnston2020-01-201-1/+1
* Fix changing password via user admin API. (#6730)Erik Johnston2020-01-201-2/+2
* Merge pull request #6714 from matrix-org/babolivier/retention_select_eventBrendan Abolivier2020-01-171-1/+1
|\
| * Remove get_room_event_after_stream_ordering entirelyBrendan Abolivier2020-01-161-1/+1
* | Add org.matrix.e2e_cross_signing to unstable_features in /versions as per MSC...Neil Johnson2020-01-161-0/+2
* | Remove duplicate session check in web fallback servlet (#6702)Andrew Morgan2020-01-151-4/+0
|/
* Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-131-2/+66
* Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-092-0/+144
* Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-081-22/+8
* Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-061-8/+22
* Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-032-103/+0
* Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-181-17/+16
* Back out change preventing setting null avatar URLsErik Johnston2019-12-111-6/+6
* Better errors regarding changing avatar_url (#6497)Andrew Morgan2019-12-091-3/+8
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab...Erik Johnston2019-12-0635-727/+509
|\
| * Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-052-56/+31
| * Port rest.client.v2Erik Johnston2019-12-0523-505/+361
| * Port rest/v1 to async/awaitErik Johnston2019-12-0510-166/+117
* | Move background update handling out of storeErik Johnston2019-12-051-1/+1
|/
* Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0410-582/+752
|\
| * Fix: Pillow error when uploading RGBA image (#3325) (#6241)Filip Štědronský2019-12-021-1/+4
| * Add User-Interactive Auth to /account/3pid/add (#6119)Andrew Morgan2019-11-291-0/+5
| * MSC2367 Allow reason field on all member eventsErik Johnston2019-11-281-1/+1
| * add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-4/+4
| * Fix startup error when http proxy is defined. (#6421)Richard van der Hoff2019-11-261-2/+2
| * Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-211-1/+1
| * Move admin endpoints into separate files (#6308)Manuel Stahl2019-11-204-555/+621
| * Merge pull request #6335 from matrix-org/erikj/rc_login_cleanupsBrendan Abolivier2019-11-201-17/+94
| |\
| | * LintBrendan Abolivier2019-11-201-1/+3
| | * Apply suggestions from code reviewErik Johnston2019-11-181-1/+1
| | * Only do `rc_login` ratelimiting on succesful login.Erik Johnston2019-11-061-18/+93
| * | 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 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
* | | Update copyrightsBrendan Abolivier2019-11-051-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)Amber Brown2019-11-014-11/+12
* | | 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_awaitErik Johnston2019-10-302-15/+9
|\ \ \
| * | | Port receipt and read markers to async/waitErik Johnston2019-10-292-15/+9
| |/ /
* / / Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
|/ /
* | Address codestyle concernsMichael Kaye2019-10-242-2/+9
* | Delay printf until logging is required.Michael Kaye2019-10-242-9/+9
|/
* Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1817-346/+585
|\
| * Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1817-346/+585
| |\
| | * 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_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)Valérian Rousset2019-10-111-1/+3
| | | |/ | | |/|
| | * | 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)krombel2019-10-102-22/+31
| | |/
| | * 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)Michael Kaye2019-10-071-1/+1
| | * 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)Erik Johnston2019-10-021-0/+8
| | * 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)Richard van der Hoff2019-09-261-64/+1
| | * | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-3/+29
| | * | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-251-62/+62
| | |/
| | * Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-243-75/+316
| | |\
| | | * 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 Morgan2019-09-231-0/+3
| | | * 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 Morgan2019-09-231-2/+45
| | | * Implement MSC2290 (#6043)Andrew Morgan2019-09-232-72/+95
| | | * 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 Morgan2019-09-202-51/+225
| | | * 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 Morgan2019-09-201-4/+0
| | | * 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 Morgan2019-09-191-17/+0
| | * | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1944-425/+732
| | |\|
| | | * Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-111-0/+1
| | | * Add changelogAndrew Morgan2019-09-101-1/+1
| | | * Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-101-1/+2
| | * | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-0/+14
| * | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-075-168/+346
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-075-168/+346
|\ \ \ \ | | |/ / | |/| |
| * | | 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 Morgan2019-09-065-162/+306
| * | | 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 Morgan2019-09-051-0/+33
* | | | 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
| |/ / |/| |
* | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0439-193/+195
|\| |
| * | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-2/+0
| * | 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)Travis Ralston2019-09-031-0/+1
| * | Remove double return statements (#5962)Andrew Morgan2019-09-033-4/+0
| * | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-2/+6
| * | fix thumbnail storage location (#5915)L0ric02019-09-021-1/+1
| * | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-6/+1
| * | 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
* | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2813-173/+367
|\| |
| * | 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_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_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)reivilibre2019-08-272-0/+78
| |/ / /
| * | | 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)Jorik Schellekens2019-08-221-1/+12
| * | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-222-0/+59
| |/ /