353 Commits

Author	SHA1	Message	Date
smilerz	18c45771e7	fix multiselect	2022-01-18 15:44:11 -06:00
vabene1111	66d29d10bf	fixed shopping v2 export drop down alignment	2022-01-18 22:38:42 +01:00
vabene1111	dfa4f444ef	Merge branch 'develop' of https://github.com/vabene1111/recipes into develop	2022-01-18 22:36:05 +01:00
vabene1111	f9c68e9fcc	layout tweaks	2022-01-18 22:35:53 +01:00
vabene1111	d65c881fde	Merge pull request #1366 from smilerz/super-cat-fix ... fix supermarket categories	2022-01-18 22:14:42 +01:00
vabene1111	7bf9f18402	allow file uploading in recipe editor	2022-01-18 21:36:20 +01:00
vabene1111	3ea96d4102	basics	2022-01-18 21:09:08 +01:00
smilerz	b3417be2ec	fix supermarket categories	2022-01-18 13:26:07 -06:00
vabene1111	8d24ae9008	small tweaks to the recipe editor	2022-01-18 19:55:51 +01:00
smilerz	2a13a341dd	enable/disable treeselect	2022-01-18 08:17:54 -06:00
vabene1111	ba1f10cd3a	Merge branch 'develop' into facet-fix	2022-01-18 07:59:32 +01:00
smilerz	4e0cc34d41	better fix for counting facets	2022-01-17 17:18:43 -06:00
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
Kaibu	c60141940d	shopping list ux improvements	2022-01-17 23:02:42 +01:00
vabene1111	e1c7305c07	switcher basically working again	2022-01-17 20:22:37 +01:00
vabene1111	d23158839b	Revert "temporarily disable recipe switcher" ... This reverts commit d2b796ddd2.	2022-01-17 17:58:09 +01:00
vabene1111	d2b796ddd2	temporarily disable recipe switcher	2022-01-17 17:58:04 +01:00
vabene1111	306f90aa98	recipe editor decimal fixes	2022-01-17 16:27:10 +01:00
vabene1111	30421d067e	Merge branch 'develop' into fuzzy_search	2022-01-17 15:51:23 +01:00
vabene1111	d3b71e40c7	cleand up context menu code	2022-01-17 15:43:35 +01:00
vabene1111	1a84a8fe80	Merge pull request #1289 from MarcusWolschon/features/1093_recipe_link_in_plan ... #1093 Recipe link in plan	2022-01-17 15:39:11 +01:00
smilerz	37971acb48	refactor recipe search	2022-01-17 08:26:34 -06:00
Marcus Wolschon	934eeee5c4	#1093 code cleanup	2022-01-14 13:56:46 +01:00
Marcus Wolschon	2927333bf1	#1093 code cleanup	2022-01-14 13:52:42 +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
smilerz	20d61160ba	refactor get_facets as RecipeFacets class	2022-01-12 12:21:28 -06:00
Marcus Wolschon	8f08ba7114	#1093 conditional receipt link in plan	2022-01-12 16:15:55 +01:00
Marcus Wolschon	8a4f35e592	#1093 Recipe link in plan ... #1093 add a recipe link into meal plan	2022-01-12 11:37:08 +01:00
vabene1111	0a6abf9688	Merge pull request #1211 from TiagoRascazzi/develop ... Added Saffron and PDF export format	2022-01-07 10:31:13 +01:00
vabene1111	724217f142	Merge branch 'develop' into feature/shopping_list_v2	2022-01-06 16:27:39 +01:00
smilerz	f65b5d0733	clear unit after adding shopping list item	2022-01-05 16:41:26 -06: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	214db80dac	add category context menu	2022-01-05 15:20:10 -06:00
Tiago Rascazzi	578154510b	Merge shopping_list develop	2022-01-04 13:19:34 -05:00
Tiago Rascazzi	1c30e643c3	Print format avoid breaking Ingredient and step	2022-01-02 22:28:16 -05: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	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
vabene1111	2e69a00fce	improved recipe edit input validation	2021-12-30 17:57:04 +01: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	a4f2c994a0	fix responsive view of add-to-shopping form	2021-12-28 16:32:26 -06:00
smilerz	2d0a7330f3	reset new list item after create	2021-12-28 12:03:36 -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	b4510a2cc1	fix categories in supermarket edit modal	2021-12-28 12:03:35 -06:00