469 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
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	c1605454dd	only show create/import on search when not loading	2022-02-19 09:37:57 +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
vabene1111	f4bfcdab2e	improved on explain and some tweaks	2022-02-11 14:15:46 +01:00
vabene1111	32a8cc9a69	proof of concept for recipe search explain	2022-02-09 18:44:29 +01:00
smilerz	c2961eede4	stub out receip search tests	2022-02-08 20:23:49 -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	62adc5a91f	make +/- search fields not clickable	2022-02-08 09:57:23 -06:00
smilerz	dc71260baa	Merge branch 'additional_fixes' into feature/custom_filters	2022-02-08 09:05:07 -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	969df37e28	fixed sharing and added additional tests	2022-02-07 15:43:06 +01:00
vabene1111	f37790a24a	changed to vue 2 lifecycle hook	2022-02-07 14:48:52 +01:00
vabene1111	5f9820ed30	Merge pull request #1469 from benscobie/issue/1434 ... Keep screen awake when viewing recipe	2022-02-07 14:48:21 +01:00
vabene1111	fd026154d8	changed step header default and fixed ingredient rendering error	2022-02-04 17:11:35 +01:00
vabene1111	7f427c2d1f	validate 0 servings in frontend	2022-02-04 16:51:16 +01:00
Chris Scoggins	f9244a93a5	fix MakeNow filter	2022-02-03 17:19:38 -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