From f4e77f6837dc5fa52f9f789bcd09b30a2f85dff6 Mon Sep 17 00:00:00 2001 From: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:32:18 +0000 Subject: [PATCH 01/12] add docker in docker --- .devcontainer/devcontainer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a37cfd0076fd..2f4334e244b5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -52,4 +52,10 @@ // "features": { // "git": "latest" // } + "features": { + "docker-in-docker": { + "version": "latest", + "dockerDashComposeVersion": "v2" + } + } } From a38dfc094e542c2ea4b659937ac60ad4acba859f Mon Sep 17 00:00:00 2001 From: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:52:41 +0000 Subject: [PATCH 02/12] update to use newer version of the feature --- .devcontainer/devcontainer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2f4334e244b5..d8676bc85817 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -53,8 +53,7 @@ // "git": "latest" // } "features": { - "docker-in-docker": { - "version": "latest", + "ghcr.io/devcontainers/features/docker-in-docker:2": { "dockerDashComposeVersion": "v2" } } From 520bc7154a31ba73911b0ec1aca3b16b4836866e Mon Sep 17 00:00:00 2001 From: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> Date: Fri, 9 Feb 2024 21:12:06 +0100 Subject: [PATCH 03/12] Remove old comments --- .devcontainer/devcontainer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d8676bc85817..fe02ce452ff7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -49,9 +49,6 @@ "onCreateCommand": "sudo chown -R vscode:vscode /workspaces/mealie/frontend/node_modules && task setup", // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "vscode", - // "features": { - // "git": "latest" - // } "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": { "dockerDashComposeVersion": "v2" From ce58da8e1870094adf5512191a10c362064de59b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 10 Feb 2024 01:08:10 +0000 Subject: [PATCH 04/12] Update dependency python-multipart to ^0.0.8 --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index e63b8fbe213f..a25735422c51 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1965,13 +1965,13 @@ pyasn1_modules = ">=0.1.5" [[package]] name = "python-multipart" -version = "0.0.7" +version = "0.0.8" description = "A streaming multipart parser for Python" optional = false python-versions = ">=3.7" files = [ - {file = "python_multipart-0.0.7-py3-none-any.whl", hash = "sha256:b1fef9a53b74c795e2347daac8c54b252d9e0df9c619712691c1cc8021bd3c49"}, - {file = "python_multipart-0.0.7.tar.gz", hash = "sha256:288a6c39b06596c1b988bb6794c6fbc80e6c369e35e5062637df256bee0c9af9"}, + {file = "python_multipart-0.0.8-py3-none-any.whl", hash = "sha256:999725bf08cf7a071073d157a27cc34f8669af98da0d2435bde1cc1493a50ec3"}, + {file = "python_multipart-0.0.8.tar.gz", hash = "sha256:613015c642c2f6dc6d22e2d3a4d993683bb4752509ccd87f831dced121ed2f1d"}, ] [package.extras] @@ -2944,4 +2944,4 @@ pgsql = ["psycopg2-binary"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "f1a8d11fafed5d812ea0e54fc01aa5761f47bffb14caaeba7216862377fbeb54" +content-hash = "1736aa5636b88092eb4e998a1a783ea13fdf1e4987b524d3570dfbc7f6e6f35a" diff --git a/pyproject.toml b/pyproject.toml index 509b9134233d..b6a8f944021e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ python-dateutil = "^2.8.2" python-dotenv = "^1.0.0" python-jose = "^3.3.0" python-ldap = "^3.3.1" -python-multipart = "^0.0.7" +python-multipart = "^0.0.8" python-slugify = "^8.0.0" recipe-scrapers = "^14.53.0" requests = "^2.31.0" From 42a33cd993b4638f181d4083a7c5d21bf110e4e4 Mon Sep 17 00:00:00 2001 From: boc-the-git <3479092+boc-the-git@users.noreply.github.com> Date: Sat, 10 Feb 2024 14:49:26 +1100 Subject: [PATCH 05/12] fix: Give update-image-tags job write permissions to the repo, for auto doco updater (#3138) --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 78162ddcf6cb..91661227fbf1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,6 +49,8 @@ jobs: needs: - build-release runs-on: ubuntu-latest + permissions: + contents: write steps: - name: Checkout 🛎 uses: actions/checkout@v4 From 2226d7cbf9f7c23e885dd5701ea3d5ae2d7782c6 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sat, 10 Feb 2024 02:56:10 -0600 Subject: [PATCH 06/12] New translations en-us.json (French) --- mealie/lang/messages/fr-FR.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mealie/lang/messages/fr-FR.json b/mealie/lang/messages/fr-FR.json index fa3c806135c8..28ebcc20488d 100644 --- a/mealie/lang/messages/fr-FR.json +++ b/mealie/lang/messages/fr-FR.json @@ -33,12 +33,12 @@ "generic-deleted": "{name} a été supprimé" }, "datetime": { - "year": "year|years", - "day": "day|days", - "hour": "hour|hours", + "year": "année|années", + "day": "jour|jours", + "hour": "heure|heures", "minute": "minute|minutes", - "second": "second|seconds", - "millisecond": "millisecond|milliseconds", - "microsecond": "microsecond|microseconds" + "second": "seconde|secondes", + "millisecond": "milliseconde|millisecondes", + "microsecond": "microseconde|microsecondes" } } From 77a05c754e9ced15bc098d1c826eaa804be5db86 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sat, 10 Feb 2024 02:56:11 -0600 Subject: [PATCH 07/12] New translations en-us.json (Swedish) --- mealie/lang/messages/sv-SE.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mealie/lang/messages/sv-SE.json b/mealie/lang/messages/sv-SE.json index d2e59308f6d3..2962dd45046a 100644 --- a/mealie/lang/messages/sv-SE.json +++ b/mealie/lang/messages/sv-SE.json @@ -33,11 +33,11 @@ "generic-deleted": "{name} har tagits bort" }, "datetime": { - "year": "year|years", - "day": "day|days", - "hour": "hour|hours", - "minute": "minute|minutes", - "second": "second|seconds", + "year": "år|år", + "day": "dag|dagar", + "hour": "timme|timmar", + "minute": "minut|minuter", + "second": "sekund|sekunder", "millisecond": "millisecond|milliseconds", "microsecond": "microsecond|microseconds" } From 38a4215b355ea789215a28ee2d2044db8ff427ac Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sat, 10 Feb 2024 02:56:12 -0600 Subject: [PATCH 08/12] New translations en-us.json (Turkish) --- mealie/lang/messages/tr-TR.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mealie/lang/messages/tr-TR.json b/mealie/lang/messages/tr-TR.json index b1292ad53462..832c6d80f6ce 100644 --- a/mealie/lang/messages/tr-TR.json +++ b/mealie/lang/messages/tr-TR.json @@ -33,12 +33,12 @@ "generic-deleted": "{name} silindi" }, "datetime": { - "year": "year|years", - "day": "day|days", - "hour": "hour|hours", - "minute": "minute|minutes", - "second": "second|seconds", - "millisecond": "millisecond|milliseconds", - "microsecond": "microsecond|microseconds" + "year": "yıl|yıllar", + "day": "gün|günler", + "hour": "saat|saatler", + "minute": "dakika|dakikalar", + "second": "saniye|saniyeler", + "millisecond": "milisaniye|milisaniyeler", + "microsecond": "mikrosaniye|mikrosaniyeler" } } From 19c5b7c7ab0676060104446851120285d9d2b7a0 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sat, 10 Feb 2024 02:56:13 -0600 Subject: [PATCH 09/12] New translations en-us.json (Ukrainian) --- mealie/lang/messages/uk-UA.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mealie/lang/messages/uk-UA.json b/mealie/lang/messages/uk-UA.json index bb0a9671a242..3409cc0ee780 100644 --- a/mealie/lang/messages/uk-UA.json +++ b/mealie/lang/messages/uk-UA.json @@ -33,12 +33,12 @@ "generic-deleted": "{name} видалено" }, "datetime": { - "year": "year|years", - "day": "day|days", - "hour": "hour|hours", - "minute": "minute|minutes", - "second": "second|seconds", - "millisecond": "millisecond|milliseconds", - "microsecond": "microsecond|microseconds" + "year": "рік|роки", + "day": "день|дні", + "hour": "година|години", + "minute": "хвилина|хвилини", + "second": "секунда|секунди", + "millisecond": "мілісекунда|мілісекунди", + "microsecond": "мікросекунда|мікросекунди" } } From cb2d8a9a505a8334bd9990469638e0c5a7e741e9 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sat, 10 Feb 2024 02:56:14 -0600 Subject: [PATCH 10/12] New translations en-us.json (Russian) --- frontend/lang/messages/ru-RU.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/lang/messages/ru-RU.json b/frontend/lang/messages/ru-RU.json index e395d82d1c59..4097021084ed 100644 --- a/frontend/lang/messages/ru-RU.json +++ b/frontend/lang/messages/ru-RU.json @@ -707,7 +707,7 @@ "email-configured": "Email настроен", "email-test-results": "Результаты теста Email", "ready": "Готово", - "not-ready": "Не готово - Проверьте переменные окружающей среды", + "not-ready": "Не готово - Проверьте переменные окружения", "succeeded": "Выполнено успешно", "failed": "Ошибка", "general-about": "Общая информация", From de69a3ca86664fe0ba9e9a302347bab7ff6a06d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 10 Feb 2024 09:12:22 +0000 Subject: [PATCH 11/12] chore(deps): update dependency mkdocs-material to v9.5.9 --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index a25735422c51..d0bb734a6646 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1220,13 +1220,13 @@ min-versions = ["babel (==2.9.0)", "click (==7.0)", "colorama (==0.4)", "ghp-imp [[package]] name = "mkdocs-material" -version = "9.5.8" +version = "9.5.9" description = "Documentation that simply works" optional = false python-versions = ">=3.8" files = [ - {file = "mkdocs_material-9.5.8-py3-none-any.whl", hash = "sha256:14563314bbf97da4bfafc69053772341babfaeb3329cde01d3e63cec03997af8"}, - {file = "mkdocs_material-9.5.8.tar.gz", hash = "sha256:2a429213e83f84eda7a588e2b186316d806aac602b7f93990042f7a1f3d3cf65"}, + {file = "mkdocs_material-9.5.9-py3-none-any.whl", hash = "sha256:a5d62b73b3b74349e45472bfadc129c871dd2d4add68d84819580597b2f50d5d"}, + {file = "mkdocs_material-9.5.9.tar.gz", hash = "sha256:635df543c01c25c412d6c22991872267723737d5a2f062490f33b2da1c013c6d"}, ] [package.dependencies] From 1450d6fc4c637cfdfd29d2ca4530de7b84ab6549 Mon Sep 17 00:00:00 2001 From: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> Date: Sat, 10 Feb 2024 12:09:21 +0100 Subject: [PATCH 12/12] fix password reset link not shown (#3142) --- frontend/pages/admin/manage/users/_id.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/frontend/pages/admin/manage/users/_id.vue b/frontend/pages/admin/manage/users/_id.vue index 182378eda43f..b39f9ae2289d 100644 --- a/frontend/pages/admin/manage/users/_id.vue +++ b/frontend/pages/admin/manage/users/_id.vue @@ -31,7 +31,18 @@ {{ $t("user.generate-password-reset-link") }} - + +
+ +

+ {{ resetUrl }} +

+
+ + {{ $t("general.close") }} + + +