cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,625 Commits 2 Branches 0 Tags 57 MiB
1fad1d2b8f
Commit Graph

1735 Commits

Author SHA1 Message Date
vabene1111
1fad1d2b8f improved deletion of recipes 2021-11-04 12:27:21 +01:00
Kaibu
980dc48eb8 Merge branch 'develop_translate_backend' into develop 
# Conflicts:
#	vue/src/locales/de.json
 2021-11-04 11:24:18 +01:00
FrenchAnon
3b612f5c8a Translated using Weblate (French) 
Currently translated at 88.7% (440 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2021-11-04 09:06:29 +00:00
Kaibu
2215e06506 translation fixes 2021-11-03 21:34:18 +01:00
Kaibu
a40c8c3f83 added password reset from key templates 2021-11-03 20:44:36 +01:00
krial057
c40f6986f1
prepTime and workTime of CookbookApp not imported correctly 2021-11-01 18:01:05 +01:00
vabene1111
4efed9a1d2 improved html importer instruction line break behavior 2021-11-01 11:27:19 +01:00
vabene1111
9a10f866e1 Merge remote-tracking branch 'origin/develop' into develop 2021-11-01 11:10:45 +01:00
vabene1111
66794d619f improved cookbook app importer 2021-11-01 11:10:35 +01:00
Kaibu
bcbd5c1103 Translated using Weblate (German) 
Currently translated at 95.9% (476 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-11-01 08:47:19 +00: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
03cd85537d fixed exporter issue 2021-10-29 13:19:50 +02:00
vabene1111
6949e17a33 possibly fixed sub path hosting issues 2021-10-29 11:29:55 +02:00
vabene1111
78c48cc36b compiled messages and added russian language to selector 2021-10-26 14:52:48 +02:00
vabene1111
2a682892c6 fixed importing of tags 2021-10-26 14:51:37 +02:00
vabene1111
0091abd2c0 fixed typo 2021-10-26 14:51:30 +02:00
vabene1111
20cbc01bb3
Merge pull request #978 from smilerz/patch 
fix 977
 2021-10-26 14:35:14 +02:00
Jesse
8bf588fd34 Translated using Weblate (Dutch) 
Currently translated at 100.0% (496 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-10-26 10:06:21 +00:00
tarek EL SOL
9e3d874322 Translated using Weblate (French) 
Currently translated at 88.5% (439 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2021-10-26 10:06:21 +00:00
smilerz
a7608de961 fix 977 2021-10-25 11:59:30 -05:00
xeals
34d9f5a1d8
Correct capitalization for KJ in preference form 2021-10-25 17:46:05 +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
xeals
b1b770c9e5
Add KJ user preference 2021-10-25 17:25:35 +11:00
rustam
e33daf7b3e Translated using Weblate (Russian) 
Currently translated at 8.8% (44 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/ru/
 2021-10-23 09:06:25 +00:00
Tomasz Klimczak
b4a5fee678 Translated using Weblate (Polish) 
Currently translated at 100.0% (362 of 362 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pl/
 2021-10-23 09:06:20 +00:00
rustam
f1d856dc72 Added translation using Weblate (Russian) 2021-10-21 20:20:14 +00:00
vabene1111
8363b1925c
Merge pull request #971 from vabene1111/feature/meal_plan_shopping 
Feature/meal plan shopping
 2021-10-21 20:36:44 +02:00
Kaibu
24c1bfa16f shopping and new nav for meal plan 2021-10-21 19:07:12 +02:00
vabene1111
ae12b8111d added debug info to system page 2021-10-20 17:51:23 +02:00
Marco Lütticke
9e3e81936b Translated using Weblate (German) 
Currently translated at 84.0% (417 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-10-20 12:06:19 +00:00
vabene1111
70df8a5ffd show better error message when recipe deletion breaks due to constraints 2021-10-19 18:22:18 +02:00
vabene1111
12b3d3a188 fixed shopping list decimal rounding 2021-10-19 17:03:24 +02:00
Kaibu
2e2b79c093 ical export and tooltips for new meal plan 2021-10-17 15:11:30 +02:00
vabene1111
c0972b1ca1 removed some unused dependencies 2021-10-14 11:27:43 +02:00
vabene1111
54a2a45959 completed migration of file view to generic model list 2021-10-14 11:20:30 +02:00
vabene1111
b214ed0825
Merge pull request #956 from smilerz/serializer_fix 
Update serializer.py
 2021-10-14 08:51:07 +02:00
smilerz
32289d2fdf
Update serializer.py 2021-10-13 20:06:50 -05:00
vabene1111
4324dd61cf Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-10-13 15:04:03 +02:00
vabene1111
1b1945d954 started migrating file editor page to generic model list 2021-10-13 15:03:59 +02:00
Hrachya Kocharyan
61e8920bf5 Translated using Weblate (Armenian) 
Currently translated at 100.0% (362 of 362 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/hy/
 2021-10-13 12:50:53 +00:00
Kaibu
4b1443a705 new meal type edit 2021-10-13 14:50:52 +02:00
vabene1111
38c0d01dc1 fixed old shopping list containing to many decimal places 2021-10-13 11:40:49 +02:00
vabene1111
b0411b986e removing build src files from repo and adding auto build 2021-10-13 10:23:34 +02:00
vabene1111
cae3a35926 added export to nav 2021-10-13 10:03:58 +02:00
vabene1111
22fd499213 build frontend 2021-10-12 18:23:53 +02:00
vabene1111
a7c80d65b1 overview for books 2021-10-12 17:13:43 +02:00
vabene1111
fe99324c38
Merge branch 'develop' into api_performance 2021-10-12 16:28:49 +02:00
vabene1111
9f1351c84a fixed app hook fix_tree 2021-10-11 16:51:41 +02:00