176 Commits

Author	SHA1	Message	Date
vabene1111	7ca7bd6111	improve generic form delete	2022-04-14 14:31:34 +02:00
vabene1111	3159868ba4	moved generic multiselect create function into component	2022-04-14 14:08:16 +02:00
vabene1111	7befa4a084	added basic ingredient editor	2022-04-14 13:01:27 +02:00
vabene1111	48e9f3f8a9	added cookmate importer	2022-04-04 22:49:50 +02:00
vabene1111	85aad42529	added mela recipes importer	2022-04-04 21:09:47 +02:00
vabene1111	2565ab30a4	lots of improvements and bookmarklet import working again	2022-03-05 15:16:58 +01:00
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
smilerz	dae49ec5f3	fix translations in helper libraries models.js and utils.js	2022-02-25 13:16:34 -06:00
vabene1111	52c16ab7dd	all types bascially working (lacking bookmark)	2022-02-22 17:00:30 +01: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
smilerz	8fa00b50b1	added update_at filter	2022-02-14 15:13:34 -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	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
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	dcad389010	food edit modal - reset children inheritance	2022-02-03 12:15:04 -06:00
Chris Scoggins	9ffae0da7b	rebuild openapi	2022-02-03 12:14:42 -06:00
Chris Scoggins	04c4182b24	WIP	2022-02-03 12:14:42 -06:00
Chris Scoggins	c45bf3a994	WIP	2022-02-03 12:14:17 -06:00
Chris Scoggins	07d5ead128	load RecipeFilter cookbook entries	2022-02-03 12:14:04 -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	890e9e7242	created CustomFilter model and api	2022-02-03 12:09:14 -06:00
Chris Scoggins	d0549bcb6d	complex book filters	2022-02-03 12:07:51 -06:00
Chris Scoggins	5e36bd0c27	complex food filters	2022-02-03 12:07:51 -06:00
Chris Scoggins	28d3d8a1e0	complex keyword filters	2022-02-03 12:07:50 -06:00
vabene1111	a0892470e1	Merge branch 'feature/export-progress' into develop	2022-01-28 15:41:49 +01:00
Chris Scoggins	6e4bb64b4e	fix translation on ModelListMenu	2022-01-26 15:00:21 -06:00
Chris Scoggins	47823132f0	add ignore_shopping && additional help	2022-01-26 12:57:29 -06:00
vabene1111	e33cf08fca	Revert "use old system to define frontend settings" ... This reverts commit f2e9f50d94.	2022-01-25 18:26:51 +01:00
vabene1111	f2e9f50d94	use old system to define frontend settings	2022-01-25 18:14:25 +01:00
smilerz	b3417be2ec	fix supermarket categories	2022-01-18 13:26:07 -06:00
Tiago Rascazzi	9c873127a5	Added loading page	2022-01-08 11:07:33 -05:00
smilerz	b919fb4ae8	quick add shoppinglist	2022-01-05 15:20:10 -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	c20e036d90	add path to generic cards for food/keywords	2021-12-28 12:03:36 -06:00
smilerz	889fa7b8ea	update console messages	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	2d94cb70ab	fix shopping list api	2021-12-28 12:03:35 -06:00
smilerz	f5e4adba8b	fix get_facets_API	2021-12-28 12:03:35 -06:00
smilerz	8f0c5e21ad	basic tests with new factories	2021-12-28 12:03:34 -06:00
smilerz	7ad088d953	fix after rebase	2021-12-28 12:03:33 -06:00
smilerz	1d224d8658	yarn build	2021-12-28 12:03:33 -06:00
smilerz	2b41fbc9f8	Fix after rebase	2021-12-28 12:03:33 -06:00
smilerz	6eec3d18fe	more fixes after rebase	2021-12-28 12:03:33 -06:00
smilerz	dcfe4de61f	Fix after rebase	2021-12-28 12:03:32 -06:00