From 0e621ae34ec1c8c0d81b83ce95eed51f0ab2d617 Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Tue, 28 May 2024 00:09:39 +0200 Subject: [PATCH 1/3] fix: add type check for undefined, use fallback when no translation for aspect ratios was given (#3025) --- javascript/localization.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/javascript/localization.js b/javascript/localization.js index 9f13d6fcb..21b3b3332 100644 --- a/javascript/localization.js +++ b/javascript/localization.js @@ -81,9 +81,12 @@ function refresh_style_localization() { } function refresh_aspect_ratios_label(value) { - label = document.querySelector('#aspect_ratios_accordion div span[data-original-text="Aspect Ratios"]') - translation = getTranslation("Aspect Ratios") - label.textContent = translation + " " + htmlDecode(value) + label = document.querySelector('#aspect_ratios_accordion div span[data-original-text="Aspect Ratios"]'); + translation = getTranslation("Aspect Ratios"); + if (typeof translation == "undefined") { + translation = "Aspect Ratios"; + } + label.textContent = translation + " " + htmlDecode(value); } function localizeWholePage() { From 4a070a9d610a1955c90f7619055460729ae0ac60 Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Tue, 28 May 2024 00:49:47 +0200 Subject: [PATCH 2/3] feat: build docker image tagged "edge" on push to main branch (#3026) * feat: build docker image on push to main branch * feat: add tag "edge" for main when building the docker image * feat: update name of build container workflow --- .github/workflows/build_container.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index 1e118a1ff..eb70cda3d 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -1,9 +1,11 @@ -name: Create and publish a container image +name: Docker image build on: push: + branches: + - main tags: - - 'v*' + - v* jobs: build-and-push-image: @@ -33,6 +35,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} + type=edge,branch=main - name: Build and push Docker image uses: docker/build-push-action@v5 From 725bf05c3129888c237a09dbfdc8ab751263492a Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Tue, 28 May 2024 01:10:45 +0200 Subject: [PATCH 3/3] release: bump version to 2.4.1, update changelog (#3027) --- fooocus_version.py | 2 +- update_log.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fooocus_version.py b/fooocus_version.py index ecc158079..750114584 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.4.0' +version = '2.4.1' diff --git a/update_log.md b/update_log.md index 77d70cb47..733f077bb 100644 --- a/update_log.md +++ b/update_log.md @@ -1,3 +1,8 @@ +# [2.4.1](https://github.com/lllyasviel/Fooocus/releases/tag/v2.4.1) + +* Fix some small bugs (e.g. adjust clip skip default value from 1 to 2, add type check to aspect ratios js update function) +* Add automated docker build on push to main, tagged with `edge`. See [available docker images](https://github.com/lllyasviel/Fooocus/pkgs/container/fooocus). + # [2.4.0](https://github.com/lllyasviel/Fooocus/releases/tag/v2.4.0) * Change settings tab elements to be more compact