397 Commits

Author	SHA1	Message	Date
smilerz	7c0d1236c2	Fix after rebase	2021-12-15 12:37:03 -06:00
smilerz	d3d4c210c1	yarn build	2021-12-15 12:37:03 -06:00
smilerz	6cffee57fe	Fix after rebase	2021-12-15 12:36:33 -06:00
smilerz	e229a70360	more fixes after rebase	2021-12-15 12:36:33 -06:00
smilerz	099a5420d6	update migrations	2021-12-15 12:36:06 -06:00
smilerz	5a9543b4d8	Fix after rebase	2021-12-15 12:36:06 -06:00
smilerz	60d7e63da8	add to shopping from card context menu	2021-12-15 12:36:06 -06:00
smilerz	867e2d4fbf	add new unit/food from shopping list	2021-12-15 12:36:06 -06:00
smilerz	757fa5e49c	edit supermarket categories	2021-12-15 12:36:06 -06:00
smilerz	8b682c33f3	related recipes included when adding mealplan to shopping list	2021-12-15 12:35:48 -06:00
smilerz	7c6a7ef6a4	alpha shopping list	2021-12-15 12:35:48 -06:00
smilerz	4c506750de	autosync	2021-12-15 12:35:48 -06:00
smilerz	b84d77be15	WIP	2021-12-15 12:35:48 -06:00
smilerz	247dd30b20	fade-enter-active	2021-12-15 12:35:48 -06:00
smilerz	5e4e203dfb	shopping line item	2021-12-15 12:35:48 -06:00
smilerz	79b6d4817e	inheritance works with object moves	2021-12-15 12:35:48 -06:00
smilerz	6075ce50e7	food inherit attributes	2021-12-15 12:35:48 -06:00
smilerz	2ca7722afb	Fix after rebase	2021-12-15 12:35:48 -06:00
smilerz	9827c3ffd5	Fix after rebase	2021-12-15 12:35:48 -06:00
vabene1111	4a747f5cd4	Revert "Revert "fixed vue build"" ... This reverts commit edde015b71.	2021-12-15 18:02:37 +01:00
vabene1111	2559905a78	fixed empty fields breaking recipe update	2021-12-15 17:45:53 +01:00
vabene1111	edde015b71	Revert "fixed vue build" ... This reverts commit 7e07508a31.	2021-12-15 17:26:06 +01:00
vabene1111	7e07508a31	fixed vue build	2021-12-03 11:47:04 +01:00
vabene1111	5d6574b8cc	Merge pull request #1068 from rose-a/fix-recipe-step-template ... Render separate ingredients flex row for each step	2021-11-30 17:23:47 +01:00
vabene1111	4d2e7eadb6	Merge branch 'develop' into generic_modal_v2	2021-11-30 17:23:27 +01:00
vabene1111	7c985cec23	Merge pull request #1088 from smilerz/search_troubleshooting ... add search debug	2021-11-30 17:21:40 +01:00
Kaibu	1907223a8a	reduced api calls	2021-11-25 12:51:55 +01:00
Kaibu	d76fdd090a	meal plan hotkeys and sharing	2021-11-25 01:28:07 +01:00
smilerz	55a0304700	add search debug	2021-11-24 12:10:15 -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
Alexander Rose	4626af3505	render separate flex row for step ingredients	2021-11-13 14:12:10 +01:00
vabene1111	df76791e1e	fixed setp headers without ingredients loading in central list	2021-11-08 17:15:37 +01:00
vabene1111	5af687364f	Merge pull request #1016 from StephenBrown2/patch-1 ... Add time unit hint to recipe edit view	2021-11-08 16:32:44 +01:00
Kaibu	4288d76afd	added more translations	2021-11-07 17:32:43 +01:00
Kaibu	195a13f825	hiding action buttons in plan settings view	2021-11-07 14:42:28 +01:00
Stephen Brown II	b4f754e7d3	Add time unit hint to recipe edit view	2021-11-04 10:17:58 -06:00
Kaibu	dd5509f5b4	translating new mealtypes	2021-11-03 23:55:39 +01:00
Kaibu	2215e06506	translation fixes	2021-11-03 21:34:18 +01:00
vabene1111	0e55fe162c	renamed components to match recommended naming	2021-11-01 11:39:10 +01:00
vabene1111	c9bd3ccae8	Merge branch 'develop' into feature/kilojoules	2021-11-01 09:46:04 +01:00
Kaibu	31720927b1	deprecated old meal plan	2021-10-31 18:08:37 +01:00
vabene1111	f720c5c094	fixed development server webpack path	2021-10-31 13:21:25 +01:00
vabene1111	4927f8bf4d	fixed nutrition form	2021-10-29 14:25:20 +02:00
vabene1111	6949e17a33	possibly fixed sub path hosting issues	2021-10-29 11:29:55 +02:00
xeals	6dfd3ae1d7	Localize nutritional energy headings	2021-10-25 17:39:04 +11: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
Kaibu	24c1bfa16f	shopping and new nav for meal plan	2021-10-21 19:07:12 +02:00
Kaibu	d62557b804	calender selector	2021-10-19 18:53:35 +02:00