|
3292c596ff
|
Merge branch 'develop' into feature/custom_filters
# Conflicts:
# vue/src/components/MealPlanEditModal.vue
# vue/src/locales/en.json
|
2022-02-17 10:57:35 +01:00 |
|
|
57658e76f5
|
fix duplicate shopping recipes when auto-add enabled
|
2022-02-14 17:47:17 -06:00 |
|
|
a0508684d9
|
cleaned up console messages
|
2022-02-03 12:14:43 -06:00 |
|
|
e00794bbdf
|
review shopping list in MealPlan modal
|
2022-01-29 14:10:14 -06:00 |
|
|
e2f8f29ec8
|
refactor list_from_recipe as class RecipeShoppingEditor
|
2022-01-29 10:28:01 -06:00 |
|
|
85bbcb0010
|
fix servings reactivity
|
2022-01-28 07:38:36 -06:00 |
|
|
24bef756e8
|
fix filter_to_supermarket setting
|
2021-12-28 12:03:35 -06:00 |
|
|
a20a877dc7
|
fix after rebase
|
2021-12-28 12:03:35 -06:00 |
|
|
cae3773d5a
|
Fix after rebase
|
2021-12-28 12:03:33 -06:00 |
|
|
f2222fd7d5
|
pre-merge
|
2021-12-28 12:03:33 -06:00 |
|
|
b8dfc00106
|
undo move
|
2021-12-28 12:03:33 -06:00 |
|
|
10a33add75
|
Fix after rebase
|
2021-12-28 12:03:31 -06:00 |
|
|
1907223a8a
|
reduced api calls
|
2021-11-25 12:51:55 +01:00 |
|
|
d76fdd090a
|
meal plan hotkeys and sharing
|
2021-11-25 01:28:07 +01:00 |
|
|
31720927b1
|
deprecated old meal plan
|
2021-10-31 18:08:37 +01:00 |
|
|
37e45bea76
|
meal plan fixes
- added translations
- form validation & tagging support for meal types
|
2021-10-09 02:25:31 +02:00 |
|
|
b7be5cd325
|
meal plan fixes
added the option to create entries from recipe card context menu
|
2021-09-26 11:55:50 +02:00 |
|
|
5c85369120
|
meal plan context menu added, further progress
|
2021-09-22 20:03:03 +02:00 |
|
|
e2def416ab
|
new meal planner basic features implemented
|
2021-09-15 17:31:25 +02:00 |
|