mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,822 Commits 21 Branches 170 Tags
e229a70360be3774203cf9ac7b55ece859395ec1
Commit Graph

1812 Commits

Author SHA1 Message Date
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
vabene1111
7aafd9829d updated translations 2021-10-11 16:30:12 +02:00
vabene1111
88a2255ed2 fixes 
translation
disabled note rendering when less than 15 characters
fixed step header rendering
fixed image in recipe edit on mobile layout
 2021-10-11 16:29:32 +02:00
Kaibu
37e45bea76 meal plan fixes 
- added translations
- form validation & tagging support for meal types
 2021-10-09 02:25:31 +02:00
vabene1111
f845acded7 Merge pull request #945 from wisdomkhan/wisdomkhan-tandoor-translate-link 
Added link for Tandoor Translate
 2021-10-08 19:11:46 +02:00
vabene1111
15b722345b importer tweaks and default tree sort setting 2021-10-08 10:20:42 +02:00
vabene1111
08ea6268e4 Translated using Weblate (German) 
Currently translated at 82.2% (408 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-10-07 19:06:15 +00:00
vabene1111
053508821f rebuild again 2021-10-06 20:16:29 +02:00
vabene1111
a870ff9325 Merge branch 'beta' into develop 
# Conflicts:
#	cookbook/static/vue/js/checklist_view.js
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/cookbook_view.js
#	cookbook/static/vue/js/edit_internal_recipe.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/meal_plan_view.js
#	cookbook/static/vue/js/model_list_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	cookbook/templates/sw.js
 2021-10-06 20:14:35 +02:00
vabene1111
ede7925203 compiled javascript 2021-10-06 20:13:36 +02:00
vabene1111
f6a9d11e3f compiled translations 2021-10-06 20:10:41 +02:00
vabene1111
e952313fec Merge pull request #948 from smilerz/new_user_fix 
minor change on recent recipe search
 2021-10-06 07:57:02 +02:00
smilerz
613b618533 ExtendedRecipeMixin 2021-10-05 06:28:25 -05:00
smilerz
e14e812c2d a better fix 2021-10-04 16:18:21 -05:00
Tomasz Klimczak
b25d1b648e 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-02 12:25:51 +00:00
Jesse
85f0ae36cf 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-02 12:25:51 +00:00
Mohammad Asim Khan
4f435748a7 Added link for Tandoor Translate 2021-10-02 17:24:46 +05:30
vabene1111
93550e2a61 Merge pull request #943 from smilerz/new_user_fix 
fix for #942
 2021-10-02 09:15:40 +02:00
smilerz
ff96e87168 fix for #942 2021-10-01 14:21:50 -05:00
vabene1111
823c5d3975 fixed model list view error for unpaginated lists 2021-10-01 18:55:16 +02:00
vabene1111
d510b521af updated nav 2021-10-01 18:45:59 +02:00
vabene1111
4e78b21ee4 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-10-01 18:39:54 +02:00
vabene1111
0de87cf38d compiled translations IT and PL 2021-10-01 18:39:50 +02:00
vabene1111
b6d878e885 fixed model list error 2021-10-01 18:34:30 +02:00