mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 12:18:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,444 Commits 21 Branches 170 Tags
dc71260baabc2aacfe25f0eb61fde78b8ab402c5
Commit Graph

3444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smilerz
dc71260baa Merge branch 'additional_fixes' into feature/custom_filters 2022-02-08 09:05:07 -06:00
smilerz
88b3ba1427 various fixes 2022-02-08 08:13:16 -06:00
smilerz
93b7e5790d merge clashing commits 2022-02-07 18:11:38 -06:00
smilerz
286c6344ec Merge branch 'feature/custom_filters' into feature/custom_filtersv2 2022-02-07 17:47:53 -06:00
smilerz
1be5889923 tests for makenow filter 2022-02-07 17:46:04 -06: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
vabene1111
f1bbe16606 Merge pull request #1498 from MaxJa4/improvement/retry_migrations 
Moved DB-waiting from docker-level to container-level
 2022-02-07 18:42:41 +01:00
MaxJa4
d28a2f81a2 Remove always-restart so the container doesn't boot-loop on error 2022-02-07 18:14:03 +01:00
MaxJa4
855f1e4ee7 Remove always-restart so the container doesn't boot-loop on error 2022-02-07 18:13:58 +01:00
MaxJa4
b53a9a1c07 Remove always-restart so the container doesn't boot-loop on error 2022-02-07 18:13:50 +01:00
MaxJa4
20cc4b93a9 Add max amount of retries for web container boot 2022-02-07 18:13:19 +01:00
vabene1111
c92c3e7d85 improved comment formatting 2022-02-07 17:43:57 +01:00
smilerz
d6af318c21 tests for single food reset inherit and additional inheritted fields 2022-02-07 09:16:48 -06:00
vabene1111
969df37e28 fixed sharing and added additional tests 2022-02-07 15:43:06 +01:00
vabene1111
f37790a24a changed to vue 2 lifecycle hook 2022-02-07 14:48:52 +01:00
vabene1111
5f9820ed30 Merge pull request #1469 from benscobie/issue/1434 
Keep screen awake when viewing recipe
 2022-02-07 14:48:21 +01:00
vabene1111
543fbfc120 Merge pull request #1490 from murphy83/develop 
Added docker compose file for IPv6 native
 2022-02-07 14:42:53 +01:00
vabene1111
bcd85ff7d6 Merge pull request #1501 from besendorf/patch-1 
add instructions for pwa for Android/Chrome browsers
 2022-02-07 14:42:03 +01:00
vabene1111
0dbb9457a1 fixed test 2022-02-07 14:41:36 +01:00
vabene1111
5cc81d977f updated translations 2022-02-07 14:41:00 +01:00
vabene1111
39ca3ac1ad no system page for non superuser 2022-02-07 13:08:18 +01:00
besendorf
cec74d77ec add instructions for pwa for Android/Chrome browsers 
fixes #1349
 2022-02-06 22:50:48 +01: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
Marion Kämpfer
2b6e365f0b Translated using Weblate (French) 
Currently translated at 91.0% (517 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2022-02-06 21:31:32 +00:00
David Laukamp
2f045e6e0d Translated using Weblate (German) 
Currently translated at 96.6% (549 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-02-06 21:31:32 +00:00
Christian
8dffc58ca6 Translated using Weblate (German) 
Currently translated at 96.6% (549 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-02-06 21:31:32 +00:00
MaxJa4
fd5de4e47c Included error code in log message 2022-02-06 19:22:46 +01:00
MaxJa4
bb131ef16a Improved wording of log message upon retry 2022-02-06 19:12:52 +01:00
MaxJa4
773d2eff37 Moved db-waiting from docker-level to container-level 2022-02-06 18:54:42 +01: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
Kai Schlachter
80965c5462 Added docker compose file for IPv6 native 2022-02-05 13:14:04 +01:00
vabene1111
65eb80dbe6 Merge pull request #1484 from kristof-mattei/patch-1 
Fixed JS parsing error on settings page
 2022-02-05 11:21:59 +01:00
Kristof Mattei
3b946e512c Aligned formatting. 2022-02-04 14:04:05 -08:00
Kristof Mattei
d2a6409381 Fixed parsing error, } should've been included 2022-02-04 14:02:50 -08: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
vabene1111
fd026154d8 changed step header default and fixed ingredient rendering error 2022-02-04 17:11:35 +01:00
vabene1111
7f427c2d1f validate 0 servings in frontend 2022-02-04 16:51:16 +01:00
Chris Scoggins
ab52bd1a07 fix makenow/fulltext search duplicate results 2022-02-04 08:40:20 -06:00
vabene1111
4fe5290b15 Merge branch 'feature/export-progress' into develop 2022-02-04 14:29:56 +01:00
Chris Scoggins
f9244a93a5 fix MakeNow filter 2022-02-03 17:19:38 -06: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
a0508684d9 cleaned up console messages 2022-02-03 12:14:43 -06:00
Chris Scoggins
9ffae0da7b rebuild openapi 2022-02-03 12:14:42 -06:00
Chris Scoggins
04c4182b24 WIP 2022-02-03 12:14:42 -06:00