From 51ca65e3c385174d76e6d8a806cfc7a48e815fbc Mon Sep 17 00:00:00 2001 From: Denis Danilov <47401054+AipNooBest@users.noreply.github.com> Date: Thu, 14 Aug 2025 00:57:28 +0300 Subject: [PATCH 01/24] fix: change libldap-2.5 to libldap2 in docker (#5946) --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e745a574d..a8839a15a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -132,7 +132,7 @@ RUN apt-get update \ gosu \ iproute2 \ libldap-common \ - libldap-2.5 \ + libldap2 \ && rm -rf /var/lib/apt/lists/* # create directory used for Docker Secrets From 31530a68e12be2866106bac92c26fc18e564d201 Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Thu, 14 Aug 2025 00:23:11 -0500 Subject: [PATCH 02/24] feat: Remove Not-Sort-By-Label and Refactor Shopping List Page (#5866) Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> --- .../components/Domain/Recipe/RecipeList.vue | 10 +- .../ShoppingList/MultiPurposeLabelSection.vue | 1 + .../Domain/ShoppingList/ShoppingListItem.vue | 55 +- .../sub-composables/use-shopping-list-copy.ts | 50 + .../sub-composables/use-shopping-list-crud.ts | 263 +++++ .../sub-composables/use-shopping-list-data.ts | 117 +++ .../use-shopping-list-labels.ts | 73 ++ .../use-shopping-list-recipes.ts | 51 + .../use-shopping-list-sorting.ts | 135 +++ .../use-shopping-list-state.ts | 70 ++ .../use-shopping-list-page.ts | 194 ++++ frontend/composables/use-users/preferences.ts | 2 - frontend/pages/shopping-lists/[id].vue | 941 ++---------------- 13 files changed, 1030 insertions(+), 932 deletions(-) create mode 100644 frontend/composables/shopping-list-page/sub-composables/use-shopping-list-copy.ts create mode 100644 frontend/composables/shopping-list-page/sub-composables/use-shopping-list-crud.ts create mode 100644 frontend/composables/shopping-list-page/sub-composables/use-shopping-list-data.ts create mode 100644 frontend/composables/shopping-list-page/sub-composables/use-shopping-list-labels.ts create mode 100644 frontend/composables/shopping-list-page/sub-composables/use-shopping-list-recipes.ts create mode 100644 frontend/composables/shopping-list-page/sub-composables/use-shopping-list-sorting.ts create mode 100644 frontend/composables/shopping-list-page/sub-composables/use-shopping-list-state.ts create mode 100644 frontend/composables/shopping-list-page/use-shopping-list-page.ts diff --git a/frontend/components/Domain/Recipe/RecipeList.vue b/frontend/components/Domain/Recipe/RecipeList.vue index 667e78cbf..98857de52 100644 --- a/frontend/components/Domain/Recipe/RecipeList.vue +++ b/frontend/components/Domain/Recipe/RecipeList.vue @@ -1,5 +1,5 @@