summary refs log tree commit diff
path: root/synapse/rest/client (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add 'brand' field to MSC2858 response (#9242)Richard van der Hoff2021-01-271-0/+2
* Implement MSC2858 support (#9183)Richard van der Hoff2021-01-271-6/+49
* Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-201-2/+1
* Validate the server name for the /publicRooms endpoint. (#9161)Patrick Cloke2021-01-191-2/+17
* Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-182-26/+7
* Remove user's avatar URL and displayname when deactivated. (#8932)Dirk Klimpel2021-01-121-2/+5
* UI Auth via SSO: redirect the user to an appropriate SSO. (#9081)Richard van der Hoff2021-01-123-42/+22
* Kill off `HomeServer.get_ip_from_request()` (#9080)Richard van der Hoff2021-01-125-39/+10
* Add some tests for the IDP picker flowRichard van der Hoff2021-01-071-2/+2
* Combine the SSO Redirect Servlets (#9015)Richard van der Hoff2021-01-042-89/+34
* Check if group IDs are valid before using them. (#8977)Patrick Cloke2020-12-301-3/+45
* 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
* Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-181-3/+7
* 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
* | Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-161-14/+1
* | Honour AS ratelimit settings for /login requests (#8920)Erik Johnston2020-12-111-6/+19
* | Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-031-1/+1
|/
* Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-011-105/+2
* 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-302-5/+5
* 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-171-0/+1
* Add metrics for tracking 3PID /requestToken requests. (#8712)Erik Johnston2020-11-132-0/+22
* Remove unused OPTIONS handlers. (#8621)Patrick Cloke2020-10-2212-62/+0
* Expose the experimental appservice login flow to clients. (#8504)Patrick Cloke2020-10-191-0/+2
* 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-095-32/+26
* 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
* 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
* Make token serializing/deserializing async (#8427)Erik Johnston2020-09-305-11/+19
* Allow additional SSO properties to be passed to the client (#8413)Patrick Cloke2020-09-301-7/+15
* 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 tag 'v1.20.0rc5' into developPatrick Cloke2020-09-181-0/+19
|\
| * Add flags to /versions about whether new rooms are encrypted by default. (#8343)Patrick Cloke2020-09-181-0/+19
* | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-1838-121/+121
* | Allow appservice users to /login (#8320)Will Hunt2020-09-181-10/+39
* | Fix a potential bug of UnboundLocalError (#8329)Jonathan de Jong2020-09-171-5/+8
* | Fix typos in comments.Patrick Cloke2020-09-141-1/+1
* | Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-76/+0
* | Don't remember `enabled` of deleted push rules and properly return 404 for mi...reivilibre2020-09-091-2/+13
* | Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-081-9/+57
|/
* Stop sub-classing object (#8249)Patrick Cloke2020-09-042-2/+2
* Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-021-0/+1
* Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-022-0/+70
* 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
* 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-201-27/+40
* 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-192-7/+9
* 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-061-1/+1
| |\
| * | 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-071-1/+1
* | | 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
| |/ |/|
* | 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
* Do not convert async functions to Deferreds in the interactive_auth_handler (...Patrick Cloke2020-07-241-26/+21
* 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
* 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-151-6/+7
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-151-5/+3
* 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
* 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-025-46/+19
|\
| * Ensure that HTML pages served from Synapse include headers to avoid embedding.Patrick Cloke2020-07-025-46/+19
* | Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-011-2/+2
* | add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)Sorunome2020-06-241-1/+4
* | Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-171-2/+2
|\ \
| * \ 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-165-22/+11
* | | | 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
| |/ |/|
* | Remove "user_id" from GET /presence. (#7606)Will Hunt2020-06-111-1/+3
|/
* 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
* Fix a bug in automatic user creation with m.login.jwt. (#7585)Olof Johansson2020-06-011-7/+8
* Add ability to wait for replication streams (#7542)Erik Johnston2020-05-222-9/+13
* 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-202-5/+20
* Merge tag 'v1.13.0rc3' into developPatrick Cloke2020-05-181-9/+13
|\
| * Hash passwords earlier in the registration process (#7523)Patrick Cloke2020-05-181-9/+13
* | 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-081-3/+25
|/
* Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-302-4/+4
* Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-232-2/+27
* 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
* | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-171-1/+24
* | 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
* | 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-262-0/+60
* | 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
* | Clean-up some auth/login REST code (#7115)Patrick Cloke2020-03-202-41/+20
|/
* Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-181-1/+4
* 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
* | 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
| * Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-021-6/+34
* | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error hand...Andrew Morgan2020-02-261-0/+1
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-213-6/+6
|/
* 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
* 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
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-1/+1
* Fixup synapse.rest to pass mypy (#6732)Erik Johnston2020-01-204-9/+17
* Fix `/events/:event_id` deprecated API. (#6731)Erik Johnston2020-01-201-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
* 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
* Port rest.client.v2Erik Johnston2019-12-0523-505/+361
* Port rest/v1 to async/awaitErik Johnston2019-12-0510-166/+117
* Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-044-22/+104
|\
| * 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
| * 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
* | 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-011-1/+1
* | Update black to 19.10b0 (#6304)Amber Brown2019-11-013-10/+11
* | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-314-14/+14
* | 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-241-1/+6
* Delay printf until logging is required.Michael Kaye2019-10-241-3/+3
* Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-188-224/+481
|\
| * Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-188-224/+481
| |\
| | * 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
| | * | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-102-22/+31
| | |/
| | * 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-1933-384/+525
| | |\|
| | | * 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-074-167/+345
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-074-167/+345
|\ \ \ \ | | |/ / | |/| |
| * | | 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-064-161/+305
| * | | 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-0431-165/+164
|\| |
| * | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-2/+0
| * | Remove double return statements (#5962)Andrew Morgan2019-09-032-3/+0
| * | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-2/+6
| * | 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-3030-158/+158
| * | 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-285-67/+46
|\| |
| * | 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
| |/ /
| * / Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-2/+2
| |/
| * Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-3/+11
| * LintBrendan Abolivier2019-08-011-4/+2
| * Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+17
* | apply PR review suggestionsHubert Chathi2019-08-211-1/+1
* | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0134-236/+247
|\|
| * Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-242-7/+32
| |\
| | * Fix servlet metric names (#5734)Jorik Schellekens2019-07-242-7/+32
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2334-229/+215
| |/
* / allow uploading keys for cross-signingHubert Chathi2019-07-251-3/+43
|/
* Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-181-32/+43
* Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-112-4/+15
* Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
* Include the original event in /relations (#5626)Andrew Morgan2019-07-091-3/+5
* Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-082-16/+9
* Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
* Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-1/+1
* Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-021-8/+46
|\
| * Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-011-1/+1
| |\