441 Commits

Author	SHA1	Message	Date
vabene1111	5a7c914fe7	added lots of user information	2020-12-31 13:38:16 +01:00
vabene1111	1bdf14dbf9	made and compiled messages + fixed lots of typos	2020-12-31 12:56:18 +01:00
vabene1111	6ef173d82d	fixed and cleand up a lot of servings related stuff	2020-12-31 12:44:19 +01:00
vabene1111	1e471ad40d	removed all trans tags from javascript code ... replaced by django recommended javascript catalog still need to sort out the different translation domains	2020-12-31 12:30:31 +01:00
vabene1111	8b2833f353	re added stuff	2020-12-28 14:14:34 +01:00
vabene1111	c4273a4c3f	Merge branch 'develop' into recipe-serving-count	2020-12-28 10:19:52 +01:00
vabene1111	bb48655acb	Merge pull request #279 from l0c4lh057/improve ... Minor improvements	2020-12-26 13:48:54 +01:00
vabene1111	592bd4f11e	fixed some english translations	2020-12-26 13:46:55 +01:00
tourn	6f3068a28c	Show default serving count in meal planner	2020-12-24 11:51:51 +01:00
tourn	aa57b47d18	Use correct serving count from recipe view -> add to shopping	2020-12-24 11:28:59 +01:00
tourn	113e9ef1e3	Merge remote-tracking branch 'upstream/develop' into recipe-serving-count	2020-12-24 11:17:56 +01:00
Aaron	0a40de0f14	Add min/max to servings spinner	2020-12-22 23:52:40 +01:00
Aaron	bc31f013c0	Fix 'All Keywords' label in website import	2020-12-22 23:51:55 +01:00
Aaron	e7fc15dc72	Show advanced search again if it was used	2020-12-22 23:50:59 +01:00
vabene1111	7ca88f3c0a	fixed scaling for fractions	2020-12-15 22:16:15 +01:00
vabene1111	e7922a7e47	nutirtion fix	2020-12-14 19:12:01 +01:00
vabene1111	d3bc440c83	meal plan quality of life stuff	2020-12-14 17:37:51 +01:00
vabene1111	910b28fe2d	meal plan date handling rewrite	2020-12-14 17:11:40 +01:00
vabene1111	89cd8bc2d2	fixed wrong translation	2020-12-14 15:49:32 +01:00
vabene1111	7732aa7646	added support for fractions	2020-12-14 14:08:11 +01:00
vabene1111	9863447bac	small nutrition fixes	2020-12-14 12:56:18 +01:00
vabene1111	53b00cc4c8	Merge pull request #199 from sebimarkgraf/feature/nutrition ... Add nutritional values	2020-12-14 12:29:56 +01:00
tourn	6fd9cf0d8c	Use serving count in shopping list	2020-11-20 15:22:58 +01:00
tourn	1e800889e4	Merge remote-tracking branch 'upstream/master' into recipe-serving-count	2020-11-20 14:44:09 +01:00
Sebastian Markgraf	422113a745	Finish editing of nutritional information	2020-11-17 22:27:01 +01:00
vabene1111	c413db5460	fixed english typo	2020-11-14 11:16:01 +01:00
Sebastian Markgraf	2f038edf8c	Fix missing string literals for translations.	2020-11-06 17:24:20 +01:00
Sebastian Markgraf	a754002f4e	Revert approach to fixed nutritional values.	2020-11-06 17:22:21 +01:00
vabene1111	8d582548bd	Merge pull request #213 from tourn/random-recipes2 ... Show random recipes in meal planner	2020-11-04 15:06:50 +01:00
vabene1111	a1b15d46b8	fixed note only meal plan entries not working	2020-11-04 14:58:31 +01:00
tourn	69a6edee99	Show random recipes in meal planner	2020-11-03 16:46:31 +01:00
vabene1111	e427d8b714	donst export checked items	2020-10-21 20:35:26 +02:00
vabene1111	89b8dbe57f	added online check to prevent message spam	2020-10-20 23:08:30 +02:00
vabene1111	c6f40db7e3	shopping list tweaks	2020-10-20 20:54:15 +02:00
Sebastian Markgraf	31dabd4757	Add nutritions output	2020-10-18 17:31:56 +02:00
Sebastian Markgraf	7a89015ac5	Add migrations.	2020-10-16 23:59:19 +02:00
Sebastian Markgraf	2b1cde2efc	Add basic output for nutritions.	2020-10-16 23:44:18 +02:00
vabene1111	cb3b8c931e	fixed broken defautl share	2020-10-16 00:11:41 +02:00
vabene1111	72bea14c3a	added sharing	2020-10-16 00:01:14 +02:00
vabene1111	5c1cecb7e7	fixed saving null units	2020-10-15 21:37:15 +02:00
vabene1111	526cf13b8d	increased max text area size of instructions	2020-10-15 21:27:41 +02:00
vabene1111	3c21baf876	fixed create shopping list from recipe	2020-10-15 21:26:24 +02:00
vabene1111	2d2c38517c	fixed null units breaking shopping lists	2020-10-15 21:19:49 +02:00
vabene1111	675f30126c	updated base translation files	2020-09-29 19:38:58 +02:00
vabene1111	25b051323c	shopping list basic sorting	2020-09-29 18:18:43 +02:00
vabene1111	697de3d9fc	small mobile layout improvements	2020-09-29 14:19:17 +02:00
vabene1111	7bc09dfe89	finishes shopping lists	2020-09-29 14:15:18 +02:00
vabene1111	a9bad5e5f9	create shopping from mealplan	2020-09-29 12:41:59 +02:00
vabene1111	9f7106a325	shopping list fixes	2020-09-29 11:41:10 +02:00
vabene1111	73f13f56e1	added ability to display message to users (via admin)	2020-09-22 12:36:27 +02:00