mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 13:19:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,533 Commits 21 Branches 170 Tags
f66b422f6825856cd727c8f9cee7a3add596a05c
Commit Graph

383 Commits

Author SHA1 Message Date
ivo
f875942e79 Translated using Weblate (Portuguese) 
Currently translated at 1.0% (4 of 378 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt/
 2022-03-15 19:31:47 +00:00
vabene1111
e901c6708c Merge branch 'develop' into feature/importer_to_vue 2022-03-15 13:02:10 +01:00
ivo
4a5af48f33 Added translation using Weblate (Portuguese) 2022-03-14 18:51:14 +00:00
vabene1111
5627161c5e Merge branch 'develop' into feature/importer_to_vue 2022-03-10 15:27:11 +01:00
Felipe Castro
5ab11eb1bc Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 0.5% (2 of 378 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt_BR/
 2022-03-08 01:31:43 +00:00
smilerz
486d197854 allow marking recipe as food 2022-03-06 23:12:59 -06:00
Felipe Castro
ed33114947 Added translation using Weblate (Portuguese (Brazil)) 2022-03-07 00:56:04 +00:00
vabene1111
bdccdf0893 Merge branch 'develop' into feature/importer_to_vue 
# Conflicts:
#	cookbook/helper/recipe_url_import.py
 2022-03-04 14:33:59 +01:00
vabene1111
8ea882e5b3 Merge branch 'develop' into improvement/multiselect_localization 2022-03-01 15:55:27 +01:00
vabene1111
65432895ba Merge branch 'develop' into improvement/minor_translation_fixes 2022-03-01 15:54:44 +01:00
MaxJa4
cebd47a639 Fixed json format after merge 2022-02-28 21:21:06 +01:00
MaxJa4
1e3a6fadf0 More localization of recipe search and view 2022-02-28 21:19:00 +01:00
MaxJa4
47723673d0 Multiselect controls are now fully localized in RecipeEditView 2022-02-28 20:28:41 +01:00
MaxJa4
429d381f63 Auto selects amount of ingredient when adding new ingredient. 2022-02-28 19:43:37 +01:00
MaxJa4
b393d026f7 Added a few more strings to be localized and fixed one ui alignment 2022-02-27 22:40:03 +01:00
smilerz
dae49ec5f3 fix translations in helper libraries models.js and utils.js 2022-02-25 13:16:34 -06:00
Maximilian Jannack
715e301a4d Revert "Revert "Added some translations in meal plan, recipe search and recipe switcher."" 
This reverts commit 391c45b8be.
 2022-02-25 10:43:34 +01:00
MaxJa4
391c45b8be Revert "Added some translations in meal plan, recipe search and recipe switcher." 
This reverts commit b2fa1db4f9.
 2022-02-24 20:53:52 +01:00
MaxJa4
b2fa1db4f9 Added some translations in meal plan, recipe search and recipe switcher. 2022-02-24 19:19:25 +01:00
vabene1111
52c16ab7dd all types bascially working (lacking bookmark) 2022-02-22 17:00:30 +01:00
vabene1111
89348f69f1 basics of new import page 2022-02-19 16:55:17 +01:00
vabene1111
b19ff3dca4 added import/create buttons to empty search 2022-02-19 09:16:54 +01:00
vabene1111
d342e12363 show warning for multiple identical filter 2022-02-17 14:23:35 +01:00
vabene1111
3292c596ff Merge branch 'develop' into feature/custom_filters 
# Conflicts:
#	vue/src/components/MealPlanEditModal.vue
#	vue/src/locales/en.json
 2022-02-17 10:57:35 +01:00
vabene1111
4fa5b28328 Merge branch 'develop' into feature/copy-to-new-recipe 2022-02-17 10:55:59 +01:00
smilerz
501f56ffd5 copy to new recipe 2022-02-16 09:16:51 -06:00
smilerz
19708dbc64 paste list of ingredients 2022-02-14 17:28:16 -06:00
smilerz
8fa00b50b1 added update_at filter 2022-02-14 15:13:34 -06:00
smilerz
e72f6e4ac4 Merge remote-tracking branch 'upstream/feature/custom_filters' into feature/custom_filters 2022-02-13 14:14:28 -06:00
smilerz
ef81700c05 add created filter, viewed filter and viewed sort 2022-02-13 14:07:43 -06:00
vabene1111
f4bfcdab2e improved on explain and some tweaks 2022-02-11 14:15:46 +01:00
vabene1111
f320651cf8 Merge branch 'develop' into feature/custom_filters 2022-02-11 09:31:59 +01:00
vabene1111
1e9f7af017 updated translations and django version 2022-02-11 09:29:28 +01:00
Marion Kämpfer
13ed297fb9 Translated using Weblate (French) 
Currently translated at 95.9% (286 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2022-02-09 01:31:35 +00:00
vabene1111
4c5994ee7f Merge branch 'develop' into feature/custom_filters 
# Conflicts:
#	cookbook/serializer.py
#	cookbook/views/api.py
#	vue/src/utils/openapi/api.ts
 2022-02-07 18:56:19 +01:00
smilerz
d6af318c21 tests for single food reset inherit and additional inheritted fields 2022-02-07 09:16:48 -06:00
Dersim Özdag
7dcc38b5b2 Translated using Weblate (German) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-06 21:31:33 +00:00
Dirk
6068496240 Translated using Weblate (German) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-06 21:31:33 +00:00
Dirk
65003175ce Translated using Weblate (German) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-05 21:06:28 +00:00
A. L
72d29cc88a Translated using Weblate (German) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-05 21:06:28 +00:00
Dersim Özdag
bc8131ac56 Translated using Weblate (German) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-05 21:06:28 +00:00
Dirk
1c27f2f9b1 Translated using Weblate (German) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-05 21:06:28 +00:00
Tomasz Klimczak
262a1f0064 Translated using Weblate (Polish) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
 2022-02-04 19:31:33 +00:00
Chris Scoggins
6ef25b604b add food substitutions 2022-02-03 15:04:46 -06:00
Chris Scoggins
5e3f94fcf7 fix after rebase 2022-02-03 12:21:35 -06:00
Chris Scoggins
dcad389010 food edit modal - reset children inheritance 2022-02-03 12:15:04 -06:00
Chris Scoggins
04c4182b24 WIP 2022-02-03 12:14:42 -06:00
Chris Scoggins
07d5ead128 load RecipeFilter cookbook entries 2022-02-03 12:14:04 -06:00
Chris Scoggins
c042ab08c7 fix after rebase 2022-02-03 12:13:36 -06:00
Chris Scoggins
fcb8e520b7 WIP 2022-02-03 12:11:32 -06:00