140 Commits

Author	SHA1	Message	Date
MaxJa4	b2fa1db4f9	Added some translations in meal plan, recipe search and recipe switcher.	2022-02-24 19:19:25 +01:00
vabene1111	b19ff3dca4	added import/create buttons to empty search	2022-02-19 09:16:54 +01:00
vabene1111	d342e12363	show warning for multiple identical filter	2022-02-17 14:23: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	501f56ffd5	copy to new recipe	2022-02-16 09:16:51 -06:00
smilerz	19708dbc64	paste list of ingredients	2022-02-14 17:28:16 -06:00
smilerz	8fa00b50b1	added update_at filter	2022-02-14 15:13:34 -06:00
smilerz	e72f6e4ac4	Merge remote-tracking branch 'upstream/feature/custom_filters' into feature/custom_filters	2022-02-13 14:14:28 -06:00
smilerz	ef81700c05	add created filter, viewed filter and viewed sort	2022-02-13 14:07:43 -06:00
vabene1111	f4bfcdab2e	improved on explain and some tweaks	2022-02-11 14:15:46 +01:00
smilerz	d6af318c21	tests for single food reset inherit and additional inheritted fields	2022-02-07 09:16:48 -06:00
Chris Scoggins	6ef25b604b	add food substitutions	2022-02-03 15:04:46 -06:00
Chris Scoggins	5e3f94fcf7	fix after rebase	2022-02-03 12:21:35 -06:00
Chris Scoggins	dcad389010	food edit modal - reset children inheritance	2022-02-03 12:15:04 -06:00
Chris Scoggins	04c4182b24	WIP	2022-02-03 12:14:42 -06:00
Chris Scoggins	07d5ead128	load RecipeFilter cookbook entries	2022-02-03 12:14:04 -06:00
Chris Scoggins	c042ab08c7	fix after rebase	2022-02-03 12:13:36 -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
Chris Scoggins	492febe626	add saveSearch()	2022-02-03 12:08:10 -06:00
Chris Scoggins	28d3d8a1e0	complex keyword filters	2022-02-03 12:07:50 -06:00
Chris Scoggins	bb226a221e	WIP	2022-02-03 12:07:14 -06:00
smilerz	0ac369423c	WIP	2022-02-03 12:07:13 -06:00
smilerz	97224fa6a0	expert search settings	2022-02-03 12:06:57 -06:00
Stephen Brown II	3961c684f9	Fix Make_Header/Make_Ingredient text and reference	2022-02-01 09:17:30 -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
smilerz	759ae99b56	Update en.json	2022-01-26 18:58:45 -06:00
Chris Scoggins	47823132f0	add ignore_shopping && additional help	2022-01-26 12:57:29 -06:00
Kaibu	c90e5d72af	shopping list ux optimization, left handed mode	2022-01-21 00:13:36 +01:00
smilerz	2a13a341dd	enable/disable treeselect	2022-01-18 08:17:54 -06:00
vabene1111	8b1e80efeb	wip	2022-01-17 17:51:29 +01:00
smilerz	8b1233be62	facets cache-only on initial load	2022-01-13 12:02:28 -06:00
smilerz	22953b0591	trees in recipe search loaded asynchronously	2022-01-12 16:21:36 -06:00
vabene1111	724217f142	Merge branch 'develop' into feature/shopping_list_v2	2022-01-06 16:27:39 +01:00
smilerz	2c76fb7b69	make food onhand when complete shopping entry	2022-01-05 15:20:10 -06:00
smilerz	b919fb4ae8	quick add shoppinglist	2022-01-05 15:20:10 -06:00
smilerz	29aa52aa3d	fix saving old list	2022-01-05 15:20:10 -06:00
smilerz	957c659a62	Squashed commit of shoppinglist_v2	2021-12-30 15:33:34 -06:00
smilerz	79b4bc387e	change ingore_inherit to inherit_fields	2021-12-30 12:54:39 -06:00
smilerz	3fafd43e58	merge ignore shopping with onhand	2021-12-29 16:32:19 -06:00
smilerz	ab968f225b	test recent shopping list	2021-12-28 12:03:34 -06:00
smilerz	2af7b64d4f	visual indicator meal plan in shopping	2021-12-28 12:03:34 -06:00
smilerz	24b0643765	copy shopping as markdown	2021-12-28 12:03:34 -06:00
smilerz	df54b10610	download as CSV	2021-12-28 12:03:33 -06:00
smilerz	fdd86b0c2d	download shopping list PDF	2021-12-28 12:03:33 -06:00
smilerz	cae3773d5a	Fix after rebase	2021-12-28 12:03:33 -06:00