summary refs log tree commit diff
path: root/synapse/rest (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '0312266ee' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-213-89/+116
|\
| * Add initial support for a "pick your IdP" page (#9017)Richard van der Hoff2021-01-051-0/+82
| * Combine the SSO Redirect Servlets (#9015)Richard van der Hoff2021-01-042-89/+34
* | Merge commit '1c9a85056' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-7/+50
|\|
| * Add type hints to the crypto module. (#8999)Patrick Cloke2021-01-041-4/+5
| * Check if group IDs are valid before using them. (#8977)Patrick Cloke2020-12-301-3/+45
* | Merge commit '9999eb2d0' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-8/+12
|\|
| * Validate input parameters for the sendToDevice API. (#8975)Patrick Cloke2020-12-291-1/+2
| * Allow redacting events on workers (#8994)Patrick Cloke2020-12-291-7/+10
* | Merge commit '4218473f9' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-2/+136
|\|
| * Allow server admin to get admin bit in rooms where local user is an admin (#8...Erik Johnston2020-12-182-2/+136
* | Merge commit '28877fade' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-212-3/+95
|\|
| * Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-181-0/+88
| * Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-181-3/+7
* | Merge commit 'a7a913918' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-201-3/+11
|\|
| * Merge remote-tracking branch 'origin/erikj/as_mau_block' into developErik Johnston2020-12-181-3/+11
| |\
| | * Correctly handle AS registerations and add testErik Johnston2020-12-171-3/+11
* | | Merge commit 'bd30cfe86' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-162-29/+2
|\| |
| * | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-162-29/+2
* | | Merge commit 'f14428b25' into anoa/dinsic_release_1_31_0Andrew Morgan2021-04-163-31/+57
|\| |
| * | Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-111-10/+6
| * | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-111-6/+19
| * | Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-111-16/+32
* | | Merge commit 'cf7d3c90d' into dinsicAndrew Morgan2021-04-165-5/+17
|\| |
| * | Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-081-0/+5
| * | Call set_avatar_url with target_user, not user_id (#8872)Will Hunt2020-12-071-2/+2
| * | Do not raise a 500 exception when previewing empty media. (#8883)Patrick Cloke2020-12-071-1/+5
| * | Do not 500 if the content-length is not provided when uploading media. (#8862)Patrick Cloke2020-12-041-1/+1
| * | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-031-1/+1
| * | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-021-1/+1
| * | Add additional validation for the admin register endpoint. (#8837)David Florness2020-12-021-0/+3
| |/
* | Port "Add support for no_proxy and case insensitive env variables" from mainl...Andrew Morgan2021-03-222-3/+2
* | Remove extraneous print (#94)Andrew Morgan2021-03-191-1/+0
* | Add knocking support (#81)Andrew Morgan2021-02-095-20/+184
* | Merge commit 'd3ed93504' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-311-105/+2
|\|
| * Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-011-105/+2
* | Merge commit '09ac0569f' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-314-12/+27
|\|
| * Simplify appservice login code (#8847)Richard van der Hoff2020-11-301-6/+21
| * Simplify the way the `HomeServer` object caches its internal attributes. (#8...Jonathan de Jong2020-11-303-6/+6
* | Merge commit 'a090b8620' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-311-5/+17
|\|
| * Add `force_purge` option to delete-room admin api. (#8843)Richard van der Hoff2020-11-301-5/+17
* | Merge commit '7c4344747' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-316-57/+27
|\|
| * Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-256-57/+27
| * Use TYPE_CHECKING instead of magic MYPY variable. (#8770)Patrick Cloke2020-11-171-3/+2
| * Add admin API for logging in as a user (#8617)Erik Johnston2020-11-174-2/+59
* | Merged commit 'deff8f628' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-316-5/+62
* | Merge commit '4a54b821b' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-0/+22
|\|
| * Add metrics for tracking 3PID /requestToken requests. (#8712)Erik Johnston2020-11-132-0/+22
* | Merge commit 'c3119d153' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-313-0/+126
|\|
| * Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-052-0/+124
| * Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-051-0/+2
* | Merge commit 'f27a78969' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-70/+125
|\|
| * Fix race for concurrent downloads of remote media. (#8682)Erik Johnston2020-10-302-70/+125
* | Merge commit 'c97da1e45' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-1/+55
|\|
| * Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-282-1/+55
* | Merge commit '88e1d0c52' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-312-1/+68
|\|
| * Add admin API to list users' local media (#8647)Dirk Klimpel2020-10-272-1/+68
* | Merge commit '24229fac0' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-317-9/+222
|\|
| * Split admin API for reported events into a detail and a list view (#8539)Dirk Klimpel2020-10-262-2/+50
| * Add an admin api to delete local media. (#8519)Dirk Klimpel2020-10-263-3/+167
| * Fix a bug in the joined_rooms admin API (#8643)Dirk Klimpel2020-10-261-3/+4
| * Add field `total` to device list in admin API (#8644)Dirk Klimpel2020-10-261-1/+1
* | Merge commit '054a6b953' into anoa/dinsic_release_1_23_1Andrew Morgan2020-12-3110-54/+0
|\|
| * Remove unused OPTIONS handlers. (#8621)Patrick Cloke2020-10-2212-62/+0
* | Merge commit 'de5cafe98' into dinsicAndrew Morgan2020-12-311-0/+2
|\|
| * Expose the experimental appservice login flow to clients. (#8504)Patrick Cloke2020-10-191-0/+2
* | Merge commit '74976a8e4' into dinsicAndrew Morgan2020-12-3113-60/+206
|\|
| * Add correct M_BAD_JSON error code to /profile/{userId}/displayname (#8517)Aaron Raimist2020-10-141-1/+3
| * Remove the deprecated Handlers object (#8494)Patrick Cloke2020-10-097-41/+34
| * Add support for MSC2697: Dehydrated devices (#8380)Hubert Chathi2020-10-072-15/+156
| * Add support for MSC2732: olm fallback keys (#8312)Hubert Chathi2020-10-061-0/+1
| * Don't bother responding to client requests that have already disconnected (#8...Andrew Morgan2020-10-061-0/+6
| * Remove stream ordering from Metadata dict (#8452)Richard van der Hoff2020-10-051-1/+4
* | Allow users to click account renewal links multiple times without hitting an ...Andrew Morgan2020-12-301-7/+23
* | Fix users info for remote users (#71)Mathieu Velten2020-12-111-2/+1
* | Merge commit '6a8fd03ac' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-214-133/+50
|\|
| * 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
* | Merge commit 'cc40a59b4' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-217-19/+36
|\|
| * 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
* | Merge commit '8238b55e0' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-212-3/+8
|\|
| * Discard an empty upload_name before persisting an uploaded file (#7905)Will Hunt2020-09-292-3/+8
* | Merge commit 'f43c66d23' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-211-7/+0
|\|
| * 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
| |/
* | Merge commit '31acc5c30' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-211-4/+10
|\|
| * Add type annotations to SimpleHttpClient (#8372)Richard van der Hoff2020-09-241-4/+10
* | Merge commit '4325be1a5' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-2142-132/+279
|\|
| * 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
* | | Merge commit '43f2b67e4' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-0/+19
|\ \ \ | | |/ | |/|
| * | Add flags to /versions about whether new rooms are encrypted by default. (#8343)Patrick Cloke2020-09-181-0/+19
* | | Merge commit '837293c31' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-2012-48/+36
|\ \ \ | | |/ | |/|
| * | 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
* | | Merge commit 'a3a90ee03' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-208-92/+233
|\| |
| * | 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
* | | Merge commit '453dfe210' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-202-58/+26
|\| |
| * | Don't remember `enabled` of deleted push rules and properly return 404 for mi...reivilibre2020-09-091-2/+13
* | | Merge commit 'e45b83411' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-203-3/+85
|\| |
| * | 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
| |/
* | Merge commit '17fa4c7ca' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-208-9/+9
|\|
| * Stop sub-classing object (#8249)Patrick Cloke2020-09-048-9/+9
* | Merge commit '112266eaf' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-0/+1
|\|
| * Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-021-0/+1
* | Merge commit '0d4f614fd' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-203-0/+74
|\|
| * Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-023-0/+74
* | Merge commit '5c03134d0' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-54/+6
|\|
| * Move and refactor LoginRestServlet helper methods (#8182)Andrew Morgan2020-08-281-54/+6
* | Merge commit 'a466b6797' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-12/+15
|\|
| * 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
* | Merge commit '56efa9ec7' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-208-68/+134
|\|
| * 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
* | Merge commit '731dfff34' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-0/+4
|\|
| * Ensure a group ID is valid before trying to get rooms for it. (#8129)Patrick Cloke2020-08-201-0/+4
* | Merge commit 'c9c544cda' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-195-21/+23
|\|
| * 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
* | Merge commit '3c01724b3' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-3/+3
|\|
| * Iteratively encode JSON responses to avoid blocking the reactor. (#8013)Patrick Cloke2020-08-181-3/+3
* | Merge commit 'e04e465b4' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-193-61/+23
|\|
| * 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
* | Merge commit 'db131b6b2' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-2/+9
|\|
| * 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
* | | | Merge commit '4e874ed59' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-193-6/+3
|\| | |
| * | | Remove unnecessary maybeDeferred calls (#8044)Patrick Cloke2020-08-073-6/+3
* | | | Merge commit '7620912d8' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-0/+31
|\| | |
| * | | Add health check endpoint (#8048)Erik Johnston2020-08-071-0/+31
* | | | Merge commit '4dd27e6d1' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-2/+2
|\| | |
| * | | Reduce unnecessary whitespace in JSON. (#7372)David Vo2020-08-071-2/+2
* | | | Merge commit '2ffd6783c' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-1/+0
|\| | |
| * | | Revert #7736 (#8039)Brendan Abolivier2020-08-061-1/+0
* | | | Merge commit 'd4a7829b1' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-192-2/+2
|\| | |
| * | | Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-062-2/+2
* | | | Merge commit '66f24449d' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-192-63/+132
|\| | |
| * | | Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-062-65/+129
| | |/ | |/|
* | | Merge commit 'a7bdf98d0' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-162-2/+2
|\| |
| * | Rename database classes to make some sense (#8033)Erik Johnston2020-08-052-2/+2
* | | Merge commit '8ff2deda7' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-162-22/+20
|\| |
| * | Fix async/await calls for broken media providers. (#8027)Patrick Cloke2020-08-042-22/+20
* | | Merge commit 'b6c6fb795' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-161-1/+1
|\| |
| * | Allow guests to operate in encrypted rooms (#7314)Michael Albert2020-08-031-1/+1
| |/
* | Merge commit '3950ae51e' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-167-108/+141
|\|
| * 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
* | Only assert valid next_link params when provided (#65)Andrew Morgan2020-09-291-6/+9
* | Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-091-10/+56
* | Revert "Remove "user_id" from GET /presence. (#7606)"Brendan Abolivier2020-08-181-3/+1
* | dinsic lintAndrew Morgan2020-08-031-1/+0
* | Merge commit 'f88c48f3b' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-034-104/+283
|\|
| * 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
* | Merge commit '923c99502' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-0/+6
|\|
| * Skip serializing /sync response if client has disconnected (#7927)Richard van der Hoff2020-07-221-0/+6
* | Merge commit 'b74919c72' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-0/+3
|\|
| * Add debugging to sync response generation (#7929)Richard van der Hoff2020-07-221-0/+3
* | Merge commit 'de119063f' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-034-1/+46
|\|
| * 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
* | Merge commit 'a973bcb8a' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-034-13/+22
|\|
| * 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
* | Merge commit '491f0dab1' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-032-109/+50
|\|
| * Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-142-109/+50
* | Merge commit '77d2c0541' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-6/+19
|\|
| * Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-141-6/+19
* | Merge commit '43726783e' into dinsicAndrew Morgan2020-08-034-28/+31
|\|
| * `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 commit '5cdca53aa' into dinsicAndrew Morgan2020-08-0312-86/+83
|\|
| * 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
| |\
* | \ Merge commit 'e8c36e527' into dinsicAndrew Morgan2020-08-036-53/+22
|\ \ \ | | |/ | |/|
| * | Ensure that HTML pages served from Synapse include headers to avoid embedding.Patrick Cloke2020-07-026-53/+22
* | | Merge commit 'dc80a0762' into dinsicAndrew Morgan2020-08-033-5/+8
|\ \ \ | | |/ | |/|
| * | 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
* | | Merge commit 'b44bdd7f7' into dinsicAndrew Morgan2020-08-031-3/+15
|\| |
| * | Support running multiple media repos. (#7706)Erik Johnston2020-06-171-3/+15
* | | Merge commit '434716e1d' into dinsicAndrew Morgan2020-08-031-4/+4
|\| |
| * | Fetch from the r0 media path instead of the unspecced v1. (#7714)Patrick Cloke2020-06-171-4/+4
* | | Merge commit '46613aaf7' into dinsicAndrew Morgan2020-08-031-2/+2
|\| |
| * | 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
* | | | | | Merge commit 'a3f11567d' into dinsicAndrew Morgan2020-08-0310-47/+23
|\| | | | |
| * | | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-1610-52/+24
* | | | | | Merge commit '03619324f' into dinsicAndrew Morgan2020-08-034-9/+17
|\| | | | |
| * | | | | 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
| |/
* | Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-249-125/+252
|\|
| * 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
* | Prevent M_USER_IN_USE from being raised by registration methods until after e...Andrew Morgan2020-06-221-33/+12
* | Add a bulk user info endpoint and deprecate the old one (#46)Andrew Morgan2020-06-191-36/+77
* | Performance improvements to marking expired users as inactive (#47)Andrew Morgan2020-06-191-1/+1
* | Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-1013-52/+213
|\|
| * 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
| |\
| * \ 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