337 Commits

Author	SHA1	Message	Date
vabene1111	0c841ec686	another improvement to shopping list item	2022-03-16 09:21:09 +01:00
vabene1111	4dd3ba29b6	improved shopping v2 layout a little bit	2022-03-15 12:35:13 +01:00
smilerz	2993c7e688	trigger shopping modal	2022-03-01 17:17:35 -06:00
vabene1111	089e634d69	fixed mobile emoji select	2022-02-27 11:39:24 +01:00
smilerz	dae49ec5f3	fix translations in helper libraries models.js and utils.js	2022-02-25 13:16:34 -06:00
Maximilian Jannack	715e301a4d	Revert "Revert "Added some translations in meal plan, recipe search and recipe switcher."" ... This reverts commit 391c45b8be.	2022-02-25 10:43:34 +01:00
MaxJa4	391c45b8be	Revert "Added some translations in meal plan, recipe search and recipe switcher." ... This reverts commit b2fa1db4f9.	2022-02-24 20:53:52 +01:00
MaxJa4	b2fa1db4f9	Added some translations in meal plan, recipe search and recipe switcher.	2022-02-24 19:19:25 +01:00
Kaibu	05305c46ca	shopping list mobile detail fix	2022-02-23 23:23:37 +01:00
Kaibu	6d5195f0d3	improved cookbook detail loading	2022-02-23 22:44:37 +01:00
vabene1111	e081d823ed	fix book share permission	2022-02-18 17:52:32 +01:00
vabene1111	d6fa02cc9e	Merge branch 'develop' into feature/custom_filters	2022-02-18 17:25:15 +01:00
smilerz	6b5a099ba0	removed case insensitive get_or_create for units	2022-02-17 12:49:41 -06:00
vabene1111	26a5c665de	fixed instructions rendering next to ingredients on small devices	2022-02-17 15:30:08 +01:00
vabene1111	a54d08c9e2	Merge branch 'develop' into feature/custom_filters	2022-02-17 14:23:47 +01:00
florian hantke	d135c755c8	fix file path checks	2022-02-17 13:26:35 +01:00
vabene1111	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
vabene1111	4fa5b28328	Merge branch 'develop' into feature/copy-to-new-recipe	2022-02-17 10:55:59 +01:00
smilerz	42a6f8457a	remove console messages	2022-02-16 10:58:05 -06:00
smilerz	501f56ffd5	copy to new recipe	2022-02-16 09:16:51 -06:00
smilerz	4e8bbefc17	minor cleanup	2022-02-15 06:42:57 -06:00
smilerz	57658e76f5	fix duplicate shopping recipes when auto-add enabled	2022-02-14 17:47:17 -06:00
smilerz	0e258a49fb	reload book recipes when adding filter	2022-02-08 12:30:11 -06:00
smilerz	b3a830c319	fix missing pill when loading CustomFilter	2022-02-08 11:41:57 -06:00
smilerz	88b3ba1427	various fixes	2022-02-08 08:13:16 -06:00
vabene1111	4c5994ee7f	Merge branch 'develop' into feature/custom_filters ... # Conflicts: # cookbook/serializer.py # cookbook/views/api.py # vue/src/utils/openapi/api.ts	2022-02-07 18:56:19 +01:00
vabene1111	fd026154d8	changed step header default and fixed ingredient rendering error	2022-02-04 17:11:35 +01:00
Chris Scoggins	6ef25b604b	add food substitutions	2022-02-03 15:04:46 -06:00
Chris Scoggins	dcad389010	food edit modal - reset children inheritance	2022-02-03 12:15:04 -06:00
Chris Scoggins	a0508684d9	cleaned up console messages	2022-02-03 12:14:43 -06:00
Chris Scoggins	e05fd02c65	recipecoontextmenu	2022-02-03 12:14:17 -06:00
Chris Scoggins	c45bf3a994	WIP	2022-02-03 12:14:17 -06:00
Chris Scoggins	c042ab08c7	fix after rebase	2022-02-03 12:13:36 -06:00
Chris Scoggins	598f53f3d4	removeMissingItem disabled	2022-02-03 12:13:35 -06:00
Chris Scoggins	fcb8e520b7	WIP	2022-02-03 12:11:32 -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	890e9e7242	created CustomFilter model and api	2022-02-03 12:09:14 -06:00
vabene1111	b2a415b333	Merge pull request #1447 from smilerz/mealplan_shopping_useability ... Mealplan shopping useability	2022-02-01 08:28:59 +01:00
Chris Scoggins	b633be9c13	fix display issues	2022-01-31 16:24:40 -06:00
Chris Scoggins	f45e09a5a5	add units to search fields	2022-01-31 14:41:18 -06:00
Chris Scoggins	5b3a0a6e29	refactor IngredientComponent, move shopping logic to card	2022-01-31 14:05:01 -06:00
vabene1111	8216d0c025	Merge pull request #1439 from oliviapinson/develop ... Simple font size change	2022-01-31 11:41:29 +01:00
Olivia Pinson	2d36db7822	Simple font size change ... Adjusted font size so longer months won't affect arrow buttons. I think this helps the meal plan calendar look more aesthetic.	2022-01-29 22:44:19 -05: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
vabene1111	58f1ce0331	fixed rendering issue with single step recipes	2022-01-28 15:26:11 +01:00
vabene1111	20b4c4fb36	fixed using undeclared unused field	2022-01-28 15:21:07 +01:00
vabene1111	965e1664af	Merge pull request #1411 from TheHaf/feature/addPortionSizeModifiersToGui ... Feature/add portion size modifiers to gui	2022-01-28 15:17:05 +01:00
Chris Scoggins	85bbcb0010	fix servings reactivity	2022-01-28 07:38:36 -06:00