135 Commits

Author	SHA1	Message	Date
Kaibu	e2def416ab	new meal planner basic features implemented	2021-09-15 17:31:25 +02:00
vabene1111	cfaae5b200	Merge branch 'develop' into patch3	2021-09-15 17:28:25 +02:00
vabene1111	60aa384f3c	Merge pull request #901 from smilerz/patch ... fix inputLookup	2021-09-15 17:27:42 +02:00
smilerz	6a29c79e5c	fix resetList function	2021-09-15 08:50:46 -05:00
smilerz	5c0fa7cd19	fix inputLookup	2021-09-15 08:13:22 -05:00
vabene1111	dbfa27e4b9	automatic rule creation	2021-09-15 14:58:55 +02:00
vabene1111	d6f7aade46	basics for automation	2021-09-15 13:07:25 +02:00
vabene1111	aeb5682176	Merge branch 'pr/897' into develop	2021-09-15 09:16:09 +02:00
Kaibu	d9300a9a90	meal planner refactor progress	2021-09-14 23:16:33 +02: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	d1807f3c14	show shared users in recipe book view	2021-09-14 21:12:18 +02:00
vabene1111	aca526a9cd	added sharing back to recipe books	2021-09-14 21:07:15 +02:00
Kaibu	77bd44ad42	minor drawer fixes	2021-09-13 22:30:01 +02:00
smilerz	5e1ae1d877	add shopping_category and supermarkets	2021-09-13 14:41:50 -05:00
smilerz	85aca8acf6	shopping_list_category	2021-09-13 14:30:03 -05:00
Kaibu	22bde0424c	delete and create added for books	2021-09-13 20:49:25 +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
Kaibu	0501dd9a0a	layout progress	2021-09-12 22:47:31 +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	83a747739a	add new from ListInput	2021-09-08 14:01:21 -05:00
Kaibu	9bdcf09f60	started reworking books	2021-09-08 16:15:33 +02:00
vabene1111	19d152461c	various fixes food serializer	2021-09-08 15:05:54 +02:00
smilerz	c9d1a9b551	finished unit page	2021-09-06 14:00:32 -05:00
smilerz	84744560e0	infinite loader bug fixing	2021-09-06 12:28:14 -05:00
smilerz	7053a857c2	reworked MergeMixin to handle non-trees	2021-09-06 10:45:16 -05:00
smilerz	f12558951a	moved keyword Vue to generic components	2021-09-05 16:26:01 -05:00
smilerz	638dd96812	finished making FoodList completely generic	2021-09-05 14:15:58 -05:00
smilerz	d33a49538e	Squashed commit of the following:	2021-09-05 11:18:57 -05:00
smilerz	d1556f69c2	WIP	2021-09-05 11:17:28 -05:00
vabene1111	d70f1f9fc7	several small fixes to new components	2021-09-04 18:11:50 +02:00
smilerz	ac08ede464	refactored genericAPI as ApiMixin	2021-09-01 12:28:33 -05:00
smilerz	65fbbabec5	finished food view	2021-08-31 14:58:41 -05:00
smilerz	52abba1f16	stubbed out all Food GenericModalForms	2021-08-31 14:58:41 -05:00
smilerz	a1d1cbac5d	refactored Generic API	2021-08-31 14:58:40 -05:00
smilerz	caeb47aee9	bind data in dynamic fields to parent model	2021-08-31 14:58:40 -05:00
smilerz	23ecce7930	stubbed out generic form modal	2021-08-31 14:58:40 -05:00
smilerz	35dc981713	generic api mixin	2021-08-31 14:58:39 -05:00
smilerz	f7b2af7f97	working WIP	2021-08-31 14:58:39 -05:00
smilerz	d606ea8db3	moved food and keyword to generic cards	2021-08-31 14:58:39 -05:00
smilerz	72b4bd7e5c	finished food view	2021-08-31 14:58:39 -05:00
smilerz	d5e9c5d8f8	food layout complete, edit food working	2021-08-31 14:58:38 -05:00
smilerz	b56c2429c7	WIP	2021-08-31 14:58:38 -05:00
smilerz	0559143f0e	initial Vue components	2021-08-31 14:58:38 -05:00
smilerz	2808e3033d	fixes keyword filter on OR search	2021-08-31 14:58:38 -05:00
smilerz	2a1e1953ee	consolidated recently viewed into FTS queryset	2021-08-25 21:08:35 -05:00
vabene1111	8b3827e56c	small tweaks	2021-08-22 14:28:58 +02:00
vabene1111	4a1a45032e	small tweaks and fixes	2021-08-22 14:18:46 +02:00