summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/release-v1.21.2' into bbz/info-mainline-... github/bbz/info-mainline-1.21.2 bbz/info-mainline-1.21.2Ben Banfield-Zanin2020-10-1558-428/+756
|\
| * Fix bug in remote thumbnail search (#8438)Richard van der Hoff2020-10-021-20/+23
| * Convert additional templates to Jinja (#8444)Patrick Cloke2020-10-021-110/+26
| * Do not expose the experimental appservice login flow to clients. (#8440)Patrick Cloke2020-10-011-2/+0
| * fix a logging error in thumbnailer (#8435)Richard van der Hoff2020-10-011-1/+1
| * Make token serializing/deserializing async (#8427)Erik Johnston2020-09-306-12/+20
| * Allow additional SSO properties to be passed to the client (#8413)Patrick Cloke2020-09-301-7/+15
| * Various clean ups to room stream tokens. (#8423)Erik Johnston2020-09-291-1/+2
| * Discard an empty upload_name before persisting an uploaded file (#7905)Will Hunt2020-09-292-3/+8
| * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/info-mainli...Andrew Morgan2020-09-291-6/+9
| |\
| | * Only assert valid next_link params when provided (#8417)Andrew Morgan2020-09-291-6/+9
| * | Don't check whether a 3pid is allowed to register during password resetAndrew Morgan2020-09-281-7/+0
| |/
| * Add type annotations to SimpleHttpClient (#8372)Richard van der Hoff2020-09-241-4/+10
| * Admin API for reported events (#8217)Dirk Klimpel2020-09-222-0/+90
| * Merge tag 'v1.20.0rc5' into developPatrick Cloke2020-09-181-0/+19
| |\
| * | Admin API for querying rooms where a user is a member (#8306)Dirk Klimpel2020-09-182-0/+28
| * | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-1839-122/+122
| * | Allow appservice users to /login (#8320)Will Hunt2020-09-181-10/+39
| * | Use admin_patterns for all admin APIs. (#8331)Patrick Cloke2020-09-176-26/+19
| * | Fix a potential bug of UnboundLocalError (#8329)Jonathan de Jong2020-09-171-5/+8
| * | Use slots in attrs classes where possible (#8296)Patrick Cloke2020-09-141-1/+1
| * | Fix typos in comments.Patrick Cloke2020-09-143-4/+4
| * | Improve SAML error messages (#8248)Patrick Cloke2020-09-141-12/+4
| * | Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-105-80/+157
| * | Do not error when thumbnailing invalid files (#8236)Patrick Cloke2020-09-093-12/+76
| * | Don't remember `enabled` of deleted push rules and properly return 404 for mi...reivilibre2020-09-091-2/+13
| * | Include method in thumbnail media name (#7124)DeepBlueV7.X2020-09-082-1/+46
| * | Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-081-9/+57
* | | Add argument specifying whether 3pid check is happening during registrationAndrew Morgan2020-09-291-3/+5
* | | Don't check whether a 3pid is allowed to register during password reset github/anoa/info-mainline-no-check-password-reset-backport anoa/info-mainline-no-check-password-reset-backportAndrew Morgan2020-09-281-7/+0
* | | Merge remote-tracking branch 'origin/release-v1.20.1' into bbz/info-mainline-...Ben Banfield-Zanin2020-09-281-0/+19
|\ \ \ | | |/ | |/|
| * | Add flags to /versions about whether new rooms are encrypted by default. (#8343)Patrick Cloke2020-09-181-0/+19
| |/
* | Merge remote-tracking branch 'origin/release-v1.20.0' into bbz/info-mainline-... github/bbz/info-mainline-1.20.0 bbz/info-mainline-1.20.0Ben Banfield-Zanin2020-09-1541-842/+1199
|\|
| * Stop sub-classing object (#8249)Patrick Cloke2020-09-048-9/+9
| * Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-021-0/+1
| * Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-023-0/+74
| * Move and refactor LoginRestServlet helper methods (#8182)Andrew Morgan2020-08-281-54/+6
| * Do not propagate typing notifications from shadow-banned users. (#8176)Patrick Cloke2020-08-261-11/+15
| * Remove unused parameter from, and add safeguard in, get_room_data (#8174)Andrew Morgan2020-08-261-1/+0
| * Search in columns 'name' and 'displayname' in the admin users endpoint (#7377)Manuel Stahl2020-08-251-1/+3
| * Stop shadow-banned users from sending non-member events. (#8142)Patrick Cloke2020-08-243-40/+66
| * Don't fail /submit_token requests on incorrect session ID if request_token_in...Brendan Abolivier2020-08-242-0/+17
| * Allow denying or shadow banning registrations via the spam checker (#8034)Patrick Cloke2020-08-201-0/+5
| * Stop shadow-banned users from sending invites. (#8095)Patrick Cloke2020-08-202-27/+43
| * Use the JSON encoder without whitespace in more places. (#8124)Patrick Cloke2020-08-201-2/+2
| * Ensure a group ID is valid before trying to get rooms for it. (#8129)Patrick Cloke2020-08-201-0/+4
| * Remove `ChainedIdGenerator`. (#8123)Erik Johnston2020-08-191-1/+1
| * Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-193-10/+14
| * Iteratively encode JSON responses to avoid blocking the reactor. (#8013)Patrick Cloke2020-08-181-3/+3
| * Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-172-57/+18
| * Convert pusher databases to async/await. (#8075)Patrick Cloke2020-08-141-4/+5
| * Implement new experimental push rules (#7997)Brendan Abolivier2020-08-101-2/+9
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-08-065-25/+23
| | |\
| | * | Incorporate reviewBrendan Abolivier2020-08-061-2/+2
| | * | Fix PUT /pushrules to use the right rule IDsBrendan Abolivier2020-08-031-2/+9
| * | | Remove unnecessary maybeDeferred calls (#8044)Patrick Cloke2020-08-073-6/+3
| * | | Add health check endpoint (#8048)Erik Johnston2020-08-071-0/+31
| * | | Reduce unnecessary whitespace in JSON. (#7372)David Vo2020-08-071-2/+2
| * | | Revert #7736 (#8039)Brendan Abolivier2020-08-061-1/+0
| * | | Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-062-2/+2
| * | | Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-062-65/+129
| | |/ | |/|
| * | Rename database classes to make some sense (#8033)Erik Johnston2020-08-052-2/+2
| * | Fix async/await calls for broken media providers. (#8027)Patrick Cloke2020-08-042-22/+20
| * | Allow guests to operate in encrypted rooms (#7314)Michael Albert2020-08-031-1/+1
| |/
| * 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | 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
| | |/ | |/|
* | | Add rudimentary API for promoting/demoting other people in a groupTravis Ralston2020-08-211-0/+26
* | | Merge remote-tracking branch 'origin/release-v1.15.1' into bbz/info-mainline-...Ben Banfield-Zanin2020-06-2526-519/+927
|\ \ \ | | |/ | |/|
| * | Enable 3PID add/bind/unbind endpoints on r0 routesBrendan Abolivier2020-06-151-3/+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
| |\
| * | 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
* | | Merge remote-tracking branch 'origin/babolivier/info_mainline' into bbz/info-... github/bbz/info-mainline2 bbz/info-mainline2Ben Banfield-Zanin2020-04-302-7/+7
|\ \ \ | |_|/ |/| |
| * | Improve error messageBrendan Abolivier2020-04-231-1/+1
| * | Implement use of internal-infoBrendan Abolivier2020-04-232-6/+6
| |/
* / Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-211-0/+8
|/
* 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
| | |\ \