Merge 47cce0ca26 into 9d063c8d2d

Spec for MSC4312: Resetting cross-signing keys in the OAuth world
Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
2026-05-02 07:04:09 +02:00 · 2025-10-29 09:28:48 +01:00 · 2025-10-29 09:28:41 +01:00 · 2025-10-28 19:05:59 -04:00
2 changed files with 2 additions and 0 deletions
--- a/changelogs/client_server/newsfragments/2233.clarification
+++ b/changelogs/client_server/newsfragments/2233.clarification
@ -0,0 +1 @@
+Add `m.login.terms` to enumeration of authentication types.
--- a/content/client-server-api/_index.md
+++ b/content/client-server-api/_index.md
@ -906,6 +906,7 @@ This specification defines the following auth types:
 -   `m.login.msisdn`
 -   `m.login.dummy`
 -   `m.login.registration_token`
+-   {{% added-in v="1.11" %}} `m.login.terms`
 -   {{% added-in v="1.17" %}} `m.oauth`

 ###### Password-based
Author	SHA1	Message	Date
Johannes Marbach	294263c7e0	Merge `47cce0ca26` into `9d063c8d2d`	2025-10-29 09:28:48 +01:00
Johannes Marbach	47cce0ca26	Spec for MSC4312: Resetting cross-signing keys in the OAuth world Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>	2025-10-29 09:28:41 +01:00
Johannes Marbach	9d063c8d2d	Add m.login.terms to enumeration of authentication types (#2233 ) Some checks are pending Spec / 🔎 Validate OpenAPI specifications (push) Waiting to run Details Spec / 🔎 Check Event schema examples (push) Waiting to run Details Spec / 🔎 Check OpenAPI definitions examples (push) Waiting to run Details Spec / 🔎 Check JSON Schemas inline examples (push) Waiting to run Details Spec / ⚙️ Calculate baseURL for later jobs (push) Waiting to run Details Spec / 🐍 Build OpenAPI definitions (push) Blocked by required conditions Details Spec / 📢 Run towncrier for changelog (push) Waiting to run Details Spec / 📖 Build the spec (push) Blocked by required conditions Details Spec / 🔎 Validate generated HTML (push) Blocked by required conditions Details Spec / 📖 Build the historical backup spec (push) Blocked by required conditions Details Spell Check / Spell Check with Typos (push) Waiting to run Details Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>	2025-10-28 19:05:59 -04:00
				`@ -0,0 +1 @@`
				Add `m.login.terms` to enumeration of authentication types.