1811 Commits

Author	SHA1	Message	Date
smilerz	4296e8e44f	remove console messages	2021-09-14 16:19:38 -05:00
Kaibu	d9300a9a90	meal planner refactor progress	2021-09-14 23:16:33 +02:00
smilerz	c9a910daca	rebase with develop	2021-09-14 16:14:30 -05:00
smilerz	f0cf92eaa3	draggable	2021-09-14 16:10:58 -05:00
smilerz	508284c046	edit SupermarketCategoryRelations	2021-09-14 16:09:48 -05:00
vabene1111	b7fe3e38e6	fixed recipe book api test to reflect api change	2021-09-14 22:59:23 +02:00
vabene1111	70f96d3fe6	plan to eat importer	2021-09-14 22:47:26 +02:00
vabene1111	cbb2c0460c	fixed fractional servings breaking importer	2021-09-14 21:54:08 +02:00
vabene1111	aca526a9cd	added sharing back to recipe books	2021-09-14 21:07:15 +02:00
vabene1111	26f9d25bd2	fixed some integration issues	2021-09-14 20:31:41 +02:00
vabene1111	3b429c5d84	change iexact to exact for get_or_create tree mixing	2021-09-14 19:26:09 +02:00
vabene1111	5c6f09975b	fixed importer rembering old ignored recipes	2021-09-14 15:17:00 +02:00
vabene1111	0e50e4e8a0	meal master tweak and frontend build	2021-09-14 14:48:50 +02:00
vabene1111	b151356bce	recipe editor UI improvements	2021-09-14 11:47:00 +02:00
vabene1111	658ef23b42	compile messages	2021-09-13 22:40:53 +02:00
vabene1111	cfdce3de2a	make and compile messages	2021-09-13 22:40:47 +02:00
Kaibu	02635b017c	more minor drawer fixes	2021-09-13 22:38:24 +02:00
Kaibu	77bd44ad42	minor drawer fixes	2021-09-13 22:30:01 +02:00
Kaibu	659847a949	Merge branch 'develop' of https://github.com/vabene1111/recipes into develop ... # Conflicts: # cookbook/templates/base.html	2021-09-13 22:15:24 +02:00
Kaibu	9ace332ba5	drawer added	2021-09-13 22:14:15 +02:00
vabene1111	bbc6015898	Merge branch 'pr/891' into develop	2021-09-13 22:11:41 +02:00
vabene1111	6f44ad760c	quick solution for external recipe nav	2021-09-13 21:51:24 +02:00
smilerz	5e1ae1d877	add shopping_category and supermarkets	2021-09-13 14:41:50 -05:00
Kaibu	0c3dcf143f	drawer rework	2021-09-13 21:41:15 +02:00
smilerz	85aca8acf6	shopping_list_category	2021-09-13 14:30:03 -05:00
vabene1111	c1161edc6d	build	2021-09-13 21:24:41 +02:00
vabene1111	6350d0e9c5	Merge branch 'feature/recipe-edit-vue' into develop ... # Conflicts: # vue/vue.config.js # vue/webpack-stats.json	2021-09-13 21:14:45 +02:00
vabene1111	234e27c4c1	recipe editor	2021-09-13 21:13:43 +02:00
Kaibu	22bde0424c	delete and create added for books	2021-09-13 20:49:25 +02:00
Kaibu	9efc60232a	removed old asset	2021-09-13 19:30:53 +02:00
Kaibu	8b09777b2c	Merge branch 'feature/books_refactor' into develop ... # Conflicts: # vue/webpack-stats.json	2021-09-13 19:30:13 +02:00
Kaibu	fd8797e2b7	cookbook view refactored, minor ui fixes	2021-09-13 19:28:16 +02:00
vabene1111	b86c9d295a	basic errors fixed	2021-09-13 14:06:19 +02:00
vabene1111	4fbf080e2f	basics	2021-09-13 12:39:29 +02:00
Kaibu	0501dd9a0a	layout progress	2021-09-12 22:47:31 +02:00
vabene1111	79c1f2eb86	Merge branch 'develop' into generic_card_fix	2021-09-11 13:09:02 +02:00
smilerz	c8bff1660b	transposed v-model	2021-09-10 14:51:37 -05:00
smilerz	f6eb1b69cb	card loading fixes	2021-09-10 11:37:27 -05:00
smilerz	6888233b6a	fixed mispelled parameter	2021-09-10 06:44:09 -05:00
smilerz	cd137f9da3	yarn build	2021-09-09 19:07:16 -05:00
smilerz	aae3b679aa	filter by recipe	2021-09-09 18:55:47 -05:00
smilerz	249557f8ef	filter by rating	2021-09-09 15:23:46 -05:00
vabene1111	51dd137d96	Merge branch 'develop' into create_inputList	2021-09-09 05:44:43 +02:00
smilerz	7b3dee4595	fix food facets	2021-09-08 17:07:00 -05:00
smilerz	83a747739a	add new from ListInput	2021-09-08 14:01:21 -05:00
vabene1111	6936710093	Merge pull request #869 from smilerz/fixes ... Move/Merge updated to handle object vs id	2021-09-08 18:29:24 +02:00
smilerz	5f37af5710	Move/Merge updated to handle object vs id	2021-09-08 09:16:58 -05:00
Kaibu	9bdcf09f60	started reworking books	2021-09-08 16:15:33 +02:00
vabene1111	2df8ed8e80	filter distinct on some queries with shared models	2021-09-08 15:58:27 +02:00
vabene1111	19d152461c	various fixes food serializer	2021-09-08 15:05:54 +02:00