From bda2ecdbf58fd33b4ad3036ed5cc13eef02747ae Mon Sep 17 00:00:00 2001 From: AUTOMATIC1111 <16777216c@gmail.com> Date: Fri, 3 Nov 2023 19:44:57 +0300 Subject: [PATCH 01/16] Merge pull request #13839 from AUTOMATIC1111/httpx==0.24.1 requirements_versions httpx==0.24.1 --- requirements_versions.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements_versions.txt b/requirements_versions.txt index f8ae1f385ae..e84bd4270a8 100644 --- a/requirements_versions.txt +++ b/requirements_versions.txt @@ -29,3 +29,4 @@ torch torchdiffeq==0.2.3 torchsde==0.2.5 transformers==4.30.2 +httpx==0.24.1 From 4afaaf8a020c1df457bcf7250cb1c7f609699fa7 Mon Sep 17 00:00:00 2001 From: AUTOMATIC1111 <16777216c@gmail.com> Date: Fri, 3 Nov 2023 19:50:14 +0300 Subject: [PATCH 02/16] add changelog entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cd3572c8e0..2c72359fc42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.6.1 + +### Bug Fixes: + * fix an error causing the webui to fail to start ([#13839](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/13839)) + ## 1.6.0 ### Features: From e4b4ff9fadc5d8abaff031038f2eddd75cadd0fc Mon Sep 17 00:00:00 2001 From: anapnoe <124302297+anapnoe@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:05:28 +0200 Subject: [PATCH 03/16] show labels for aside, main, page tabs option setting --- .../html/templates/template-app-root.html | 1 + .../template-aside-extra-networks.html | 6 ++- .../templates/template-extras-params.html | 2 +- .../templates/template-img2img-params.html | 2 +- .../html/templates/template-train-params.html | 2 +- .../templates/template-txt2img-params.html | 2 +- .../javascript/anapnoe_sd_uiux_core.js | 44 ++++++++++++++++++- .../scripts/anapnoe_sd_uiux.py | 4 +- extensions-builtin/anapnoe-sd-uiux/style.css | 24 ++++++++++ 9 files changed, 79 insertions(+), 8 deletions(-) diff --git a/extensions-builtin/anapnoe-sd-uiux/html/templates/template-app-root.html b/extensions-builtin/anapnoe-sd-uiux/html/templates/template-app-root.html index 78e5e3fecdb..77cb68065cc 100644 --- a/extensions-builtin/anapnoe-sd-uiux/html/templates/template-app-root.html +++ b/extensions-builtin/anapnoe-sd-uiux/html/templates/template-app-root.html @@ -9,6 +9,7 @@ + Anapnoe