diff --git a/.gitignore b/.gitignore index 122c7c6e..2a58c6c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ -/api/node_modules +node_modules /assets /assets.tar.gz /data/msc /env* -/node_modules /resources /scripts/gen /scripts/continuserv/continuserv diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md index 5b4cb5d8..04d20b52 100644 --- a/content/client-server-api/_index.md +++ b/content/client-server-api/_index.md @@ -1039,9 +1039,9 @@ This returns an HTML and JavaScript page which can perform the entire login process. The page will attempt to call the JavaScript function `window.onLogin` when login has been successfully completed. -Non-credential parameters valid for the `/login` endpoint can be -provided as query string parameters here. These are to be forwarded to -the login endpoint during the login process. For example: +{{% added-in v="1.1" %}} Non-credential parameters valid for the `/login` +endpoint can be provided as query string parameters here. These are to be +forwarded to the login endpoint during the login process. For example: GET /_matrix/static/client/login/?device_id=GHTYAJCE @@ -1746,6 +1746,8 @@ The allowable state transitions of membership are: ##### Knocking on rooms +{{% added-in v="1.1" %}} +