Commit Graph

3889 Commits

Author SHA1 Message Date
vabene1111
7e7c7a3841 Merge pull request #1499 from xMAC94x/update_base_image
Update the baseimage of dockerfile as alpine 3.12 has some security v…
2022-02-11 09:04:29 +01:00
vabene1111
6ae1365505 Merge pull request #1512 from smilerz/additional_fixes
various fixes
2022-02-11 09:01:56 +01:00
vabene1111
dd2f27cfd4 Merge pull request #1513 from MaxJa4/improvement/ping_db
Ping DB instead of trying migration
2022-02-11 08:59:51 +01:00
vabene1111
1a38b54e4f Merge pull request #1520 from smilerz/LDAP-debug-logging
enable logging for LDAP
2022-02-11 08:59:04 +01:00
vabene1111
fffb0e0d07 Merge pull request #1525 from TandoorRecipes/revert-1516-patch-2
Revert "Update de.json"
2022-02-11 08:54:31 +01:00
vabene1111
de505dc8cc Revert "Update de.json" 2022-02-11 08:53:37 +01:00
vabene1111
9a735b75dc Merge pull request #1516 from hyperbit00/patch-2
Update de.json
2022-02-11 08:53:31 +01:00
smilerz
f933226c5d enable logging for LDAP 2022-02-09 16:19:51 -06:00
smilerz
baa2aa51da more recipe search tests 2022-02-09 16:18:45 -06:00
vabene1111
32a8cc9a69 proof of concept for recipe search explain 2022-02-09 18:44:29 +01:00
smilerz
c2961eede4 stub out receip search tests 2022-02-08 20:23:49 -06: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
Jesse
4c259e6b9c Translated using Weblate (Dutch)
Currently translated at 95.2% (541 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
2022-02-09 01:31:35 +00:00
Marion Kämpfer
faf51d0455 Translated using Weblate (French)
Currently translated at 94.7% (538 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
2022-02-09 01:31:35 +00:00
hyperbit00
ed1585caed Update de.json
typo
2022-02-08 23:00:57 +01:00
hyperbit00
3917521ed6 Update de.json
typo in ressource
2022-02-08 22:56:33 +01:00
smilerz
924ffc473b fix recipe sharing 2022-02-08 14:59:54 -06:00
smilerz
0e258a49fb reload book recipes when adding filter 2022-02-08 12:30:11 -06:00
MaxJa4
a1063ce922 Merge branch 'improvement/ping_db' of https://github.com/MaxJa4/recipes into improvement/ping_db 2022-02-08 19:00:56 +01:00
MaxJa4
2471bb21f6 Fixed dep. position and used smaller package 2022-02-08 19:00:54 +01:00
smilerz
b3a830c319 fix missing pill when loading CustomFilter 2022-02-08 11:41:57 -06:00
MaxJa4
45942dfa7f Fixed indentation 2022-02-08 18:20:19 +01:00
MaxJa4
cb755a47bc Remove wrong code comment 2022-02-08 18:19:32 +01:00
MaxJa4
a35aa953b4 Ping DB instead of trying migration 2022-02-08 18:15:04 +01:00
smilerz
62adc5a91f make +/- search fields not clickable 2022-02-08 09:57:23 -06:00
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
Marcel Märtens
542b656bea fix python-ldap bugs according to https://github.com/TandoorRecipes/recipes/pull/1499\#issuecomment-1031627178 2022-02-07 19:21:35 +01: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
vabene1111
74e30c79d5 Merge branch 'develop' 1.0.8 2022-02-07 18:41:57 +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
Marcel Märtens
bd8633c630 Update the baseimage of dockerfile as alpine 3.12 has some security vunerabilities.
According to:
https://artifacthub.io/packages/helm/truecharts/recipes?modal=security-report&image=tccr.io%2Ftruecharts%2Frecipes%3Av1.0.5%40sha256%3Ac74923879e7d2bf5bff4d1e953a100307462ad191a79908165f3364b97446833
There are at least 4 Chritical ones with a total of 47.
So updating the base should prob be a good thing and help here.
2022-02-06 23:57:40 +01:00
besendorf
cec74d77ec add instructions for pwa for Android/Chrome browsers
fixes #1349
2022-02-06 22:50:48 +01:00