95 Commits

Author	SHA1	Message	Date
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
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
smilerz	f245aa8b4f	add to shopping from card context menu	2021-12-28 12:03:32 -06:00
smilerz	a217db5822	add new unit/food from shopping list	2021-12-28 12:03:32 -06:00
smilerz	ecac3f3c2d	related recipes included when adding mealplan to shopping list	2021-12-28 12:03:32 -06:00
smilerz	7a0b395107	alpha shopping list	2021-12-28 12:03:32 -06:00
smilerz	fbe748db62	food inherit attributes	2021-12-28 12:03:32 -06:00
smilerz	c5c76cadea	getUserPreference available for all UserPreferences	2021-12-28 12:03:31 -06:00
smilerz	6eea7ac99b	model changes and GenericAutoSchema	2021-12-28 12:03:31 -06:00
smilerz	10a33add75	Fix after rebase	2021-12-28 12:03:31 -06:00
smilerz	5b6dd62f8e	generic modal refactored	2021-11-23 19:18:10 -06:00
vabene1111	695cab29a1	fixed book sharing and added step page	2021-11-14 15:33:25 +01:00
xeals	15eec9d373	Set calories heading based on user preference	2021-10-25 17:38:41 +11:00
xeals	c9ff0543e3	Convert nutrition input from KJ to calories with preference	2021-10-25 17:37:31 +11:00
xeals	3d830a4449	Display nutritional energy in KJ with preference	2021-10-25 17:28:52 +11:00
vabene1111	54a2a45959	completed migration of file view to generic model list	2021-10-14 11:20:30 +02:00
vabene1111	1b1945d954	started migrating file editor page to generic model list	2021-10-13 15:03:59 +02:00
smilerz	613b618533	ExtendedRecipeMixin	2021-10-05 06:28:25 -05:00
vabene1111	b6d878e885	fixed model list error	2021-10-01 18:34:30 +02:00
smilerz	17cedf17b5	stubbed out new shopping list	2021-09-30 14:56:59 -05:00
smilerz	c1a22ea2a6	chain supermarket create/update to include categories	2021-09-27 17:55:58 -05:00
smilerz	b3cffa4a38	cached facet results	2021-09-26 16:44:12 -05:00
Kaibu	e2def416ab	new meal planner basic features implemented	2021-09-15 17:31:25 +02:00
vabene1111	19d1e2d456	moved toast to bottom right to not obstruct modals	2021-09-15 14:35:03 +02:00
vabene1111	d6f7aade46	basics for automation	2021-09-15 13:07:25 +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	aca526a9cd	added sharing back to recipe books	2021-09-14 21:07:15 +02: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
vabene1111	79c1f2eb86	Merge branch 'develop' into generic_card_fix	2021-09-11 13:09:02 +02:00