Commit Graph

26 Commits

Author SHA1 Message Date
vabene1111
3e51bdc7f0 Merge branch 'develop' into feature/shopping-ui
# Conflicts:
#	cookbook/serializer.py
2024-01-28 11:05:56 +01:00
vabene1111
6b4b2a8f87 removed use_plural space attribute and left over settings 2024-01-28 08:42:42 +01:00
vabene1111
492d266fbe dont show categories without entries 2023-12-30 08:13:13 +01:00
smilerz
a0256b607e
Squashed commit of the following:
commit f8f08ae337
Author: smilerz <smilerz@gmail.com>
Date:   Wed Sep 6 10:27:43 2023 -0500

    respect ignore_shopping flag
2023-09-12 09:47:55 -05:00
vabene1111
f0f12ca83f removed use_plural space setting
remove because i dont see the need and it was causing issues
2023-02-24 23:32:30 +01:00
vabene1111
e33c3789b7 fixed add to shopping when using ingredient headers 2023-02-18 21:56:21 +01:00
vabene1111
c08c1d30ad fixed review shopping before save, improved meal plan edit modal independece 2023-02-18 21:55:17 +01:00
vabene1111
90e389f2fa fixed add to shopping modal layout 2023-01-27 15:43:22 +01:00
vabene1111
1a6e677c06 allow filter in add to shopping modal 2022-12-31 17:35:16 +01:00
Kaibu
d3c3339d5e shopping modal ui fixes 2022-06-15 16:27:43 +02:00
vabene1111
30d5587fbe added err msg to all standard toasts 2022-04-23 01:41:08 +02:00
vabene1111
e4223787be updated standard toast function 2022-04-23 01:31:15 +02:00
Chris Scoggins
6ef25b604b
add food substitutions 2022-02-03 15:04:46 -06:00
Chris Scoggins
a0508684d9
cleaned up console messages 2022-02-03 12:14:43 -06:00
Chris Scoggins
c45bf3a994
WIP 2022-02-03 12:14:17 -06:00
Chris Scoggins
5959914932
makenow filter 2022-02-03 12:11:32 -06:00
Chris Scoggins
8d78d15e21
implement sort order via API 2022-02-03 12:09:32 -06:00
Chris Scoggins
5b3a0a6e29
refactor IngredientComponent, move shopping logic to card 2022-01-31 14:05:01 -06:00
Chris Scoggins
e00794bbdf
review shopping list in MealPlan modal 2022-01-29 14:10:14 -06:00
Chris Scoggins
e2f8f29ec8
refactor list_from_recipe as class RecipeShoppingEditor 2022-01-29 10:28:01 -06:00
Chris Scoggins
85bbcb0010
fix servings reactivity 2022-01-28 07:38:36 -06:00
Chris Scoggins
7916635716
add recipes to shopping list 2022-01-21 12:01:46 -06:00
smilerz
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
smilerz
e257a8d29b fix responsive display of shopping list 2021-12-28 12:03:35 -06:00
smilerz
e66897c1ea fix Shopping Modal to filter onhand from initial list 2021-12-28 12:03:35 -06:00
smilerz
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00