269 Commits

Author	SHA1	Message	Date
Kaibu	b990462bdb	Merge branch 'develop' of https://github.com/vabene1111/recipes into develop ... # Conflicts: # vue/src/components/Modals/LookupInput.vue	2022-01-17 23:48:12 +01:00
smilerz	d8d76ae9e0	fix missing label supermarket category	2022-01-17 16:12:54 -06:00
Kaibu	c60141940d	shopping list ux improvements	2022-01-17 23:02:42 +01:00
smilerz	5724ef9511	fix boolean directive	2022-01-17 14:02:58 -06:00
vabene1111	e1c7305c07	switcher basically working again	2022-01-17 20:22:37 +01:00
vabene1111	a539d14aad	wip switcher	2022-01-17 18:15:23 +01:00
vabene1111	8b1e80efeb	wip	2022-01-17 17:51:29 +01:00
vabene1111	30421d067e	Merge branch 'develop' into fuzzy_search	2022-01-17 15:51:23 +01:00
smilerz	37971acb48	refactor recipe search	2022-01-17 08:26:34 -06:00
smilerz	0e1153ce3a	deleted extraneous emit	2022-01-13 17:40:26 -06:00
smilerz	6d9a90c6ba	fix onhand_users	2022-01-13 16:49:10 -06:00
vabene1111	e1e53d12f8	playing around with the reciupe switcher	2022-01-07 16:19:25 +01:00
vabene1111	724217f142	Merge branch 'develop' into feature/shopping_list_v2	2022-01-06 16:27:39 +01:00
smilerz	b919fb4ae8	quick add shoppinglist	2022-01-05 15:20:10 -06:00
smilerz	214db80dac	add category context menu	2022-01-05 15:20:10 -06:00
smilerz	795f3084d9	Merge branch 'feature/related_recipe_switcher' of https://github.com/TandoorRecipes/recipes into feature/related_recipe_switcher	2021-12-31 09:01:36 -06:00
smilerz	931eae4361	fix switcher to be TZ sensitive	2021-12-31 09:01:31 -06:00
smilerz	80fc50e09b	remove console message	2021-12-30 16:52:08 -06:00
smilerz	045a0b7d4f	persist servings changes	2021-12-30 15:33:47 -06:00
smilerz	957c659a62	Squashed commit of shoppinglist_v2	2021-12-30 15:33:34 -06:00
smilerz	b282c46c1a	Fix after rebase	2021-12-30 13:58:34 -06:00
smilerz	582e145a9f	Fix after rebase	2021-12-30 13:55:38 -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	52d1069353	fix reactivity of detailed items	2021-12-29 09:36:18 -06:00
smilerz	58d025f1a5	change default status of shopping in recipe view	2021-12-28 12:03:36 -06:00
smilerz	c20e036d90	add path to generic cards for food/keywords	2021-12-28 12:03:36 -06:00
smilerz	5b287ad484	fix responsive display of detail shopping list	2021-12-28 12:03:35 -06:00
smilerz	e257a8d29b	fix responsive display of shopping list	2021-12-28 12:03:35 -06:00
smilerz	a3008a6091	WIP	2021-12-28 12:03:35 -06:00
smilerz	24bef756e8	fix filter_to_supermarket setting	2021-12-28 12:03:35 -06:00
smilerz	b4510a2cc1	fix categories in supermarket edit modal	2021-12-28 12:03:35 -06:00
smilerz	63fe174070	fix add to shopping from MealPlan Modal	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	2d94cb70ab	fix shopping list api	2021-12-28 12:03:35 -06:00
smilerz	a20a877dc7	fix after rebase	2021-12-28 12:03:35 -06:00
smilerz	ed50a27669	fix rounding on new shopping list	2021-12-28 12:03:35 -06:00
smilerz	ab968f225b	test recent shopping list	2021-12-28 12:03:34 -06:00
smilerz	8f0c5e21ad	basic tests with new factories	2021-12-28 12:03:34 -06:00
smilerz	2763eed5b2	minor cleanup	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	8dcdf00dc7	refresh shopping list when item is delayed	2021-12-28 12:03:33 -06:00
smilerz	0693d31550	WIP	2021-12-28 12:03:33 -06:00
smilerz	cae3773d5a	Fix after rebase	2021-12-28 12:03:33 -06:00
smilerz	f2222fd7d5	pre-merge	2021-12-28 12:03:33 -06:00
smilerz	b8dfc00106	undo move	2021-12-28 12:03:33 -06:00
smilerz	6eec3d18fe	more fixes after rebase	2021-12-28 12:03:33 -06:00