687 Commits

Author	SHA1	Message	Date
vabene1111	bdccdf0893	Merge branch 'develop' into feature/importer_to_vue ... # Conflicts: # cookbook/helper/recipe_url_import.py	2022-03-04 14:33:59 +01:00
vabene1111	8ea882e5b3	Merge branch 'develop' into improvement/multiselect_localization	2022-03-01 15:55:27 +01:00
vabene1111	b730acc06a	Merge pull request #1596 from MaxJa4/improvement/select_amount ... Auto selects amount of ingredient when adding new ingredient.	2022-03-01 15:52:10 +01:00
MaxJa4	47723673d0	Multiselect controls are now fully localized in RecipeEditView	2022-02-28 20:28:41 +01:00
MaxJa4	429d381f63	Auto selects amount of ingredient when adding new ingredient.	2022-02-28 19:43:37 +01:00
MaxJa4	09804de809	Optimized advanced search settings UX	2022-02-27 21:53:22 +01:00
vabene1111	429607e1fe	fixed shoppoing v2 list container size	2022-02-27 11:07:06 +01:00
smilerz	56c553c35d	load language_code to new shopping list	2022-02-25 13:52:56 -06:00
vabene1111	fc6268b7ff	Merge pull request #1564 from smilerz/retain_original_ingredient_text ... retain original text when parsing ingredients	2022-02-25 16:17:44 +01: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
smilerz	c8dcca8630	fix recipe search in export form (converted to change safe genericAPI)	2022-02-23 17:24:06 -06:00
smilerz	f9a4521ca1	redirect export using djangoResolveUrl	2022-02-22 16:00:55 -06:00
smilerz	a7d66fa850	export recipes from saved filter	2022-02-22 15:18:39 -06:00
vabene1111	52c16ab7dd	all types bascially working (lacking bookmark)	2022-02-22 17:00:30 +01:00
vabene1111	0d98c77301	some small ui stuff	2022-02-21 18:29:23 +01:00
smilerz	e52054e732	retain original text when parsing ingredients	2022-02-21 09:47:27 -06:00
vabene1111	e04d672750	import with image working	2022-02-21 15:59:30 +01:00
vabene1111	c8fc67fa2b	changed source import to match field structure of recipe model ... first imports working	2022-02-19 17:54:00 +01:00
vabene1111	89348f69f1	basics of new import page	2022-02-19 16:55:17 +01:00
vabene1111	c1605454dd	only show create/import on search when not loading	2022-02-19 09:37:57 +01:00
vabene1111	55b035eaaa	first boilerplate for new import view	2022-02-19 09:34:42 +01:00
vabene1111	b19ff3dca4	added import/create buttons to empty search	2022-02-19 09:16:54 +01:00
vabene1111	7fa5c2d987	changed defaults for multiple kw/book/food filters	2022-02-19 08:51:11 +01:00
vabene1111	d6fa02cc9e	Merge branch 'develop' into feature/custom_filters	2022-02-18 17:25:15 +01:00
smilerz	2b5aec5d0a	resolved loading custom filter when not in expert mode	2022-02-18 09:08:36 -06:00
smilerz	1c18c8faac	fix expert mode	2022-02-17 10:59:53 -06:00
smilerz	f1fa5e32bf	fix case insensitive get_or_create	2022-02-17 10:50:38 -06:00
vabene1111	6a73ac0a33	fixed editor leave warning	2022-02-17 15:20:42 +01:00
vabene1111	e9431b5ff2	changed warning stylin	2022-02-17 14:53:27 +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
smilerz	a76c4365ea	mealplan showing on search when filtered instead of vice versa	2022-02-16 16:49:36 -06:00
smilerz	21c6f819a0	start counting at zero	2022-02-16 14:19:58 -06:00
smilerz	5f3d5afc37	typo	2022-02-16 14:18:23 -06:00
smilerz	57dec86b06	handle empty ingredient list when pasting	2022-02-16 14:17:41 -06:00
smilerz	d68a89a32c	catch empty lines in paste_ingredients	2022-02-16 14:07:56 -06:00
smilerz	8b94bf1333	retain order of pasted ingredients	2022-02-16 13:22:53 -06:00
smilerz	ad6d99800e	include note from ingredient API	2022-02-16 08:35:04 -06:00
smilerz	f9ae48e23c	fix Vue cookedon sort	2022-02-15 09:14:27 -06:00
smilerz	4e8bbefc17	minor cleanup	2022-02-15 06:42:57 -06:00
smilerz	19708dbc64	paste list of ingredients	2022-02-14 17:28:16 -06:00
smilerz	444e0c1918	include new filters in ResetSearch()	2022-02-14 15:35:56 -06:00
smilerz	8fa00b50b1	added update_at filter	2022-02-14 15:13:34 -06:00
smilerz	c2fa86e388	fixed typo	2022-02-13 14:35:38 -06:00
smilerz	3b8be24630	merge RecipeSearch with upstream	2022-02-13 14:15:01 -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
smilerz	bf54680178	more recipe search tests	2022-02-13 13:53:07 -06:00