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

3444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
f916e38da8 Merge pull request #1539 from smilerz/auto_add_shopping_fix 
fix duplicate shopping recipes when auto-add enabled
 2022-02-17 10:55:06 +01:00
vabene1111
f77b45725b Merge pull request #1538 from smilerz/feature/paste_ingredients 
paste list of ingredients
 2022-02-17 10:54:25 +01:00
vabene1111
8aedb80140 Merge pull request #1535 from MaxJa4/improvement/check_nginx_config 
Added existence check for Nginx config file and mandatory parameters
 2022-02-17 10:52:58 +01:00
smilerz
21c6f819a0 start counting at zero 2022-02-16 14:19:58 -06:00
smilerz
5f3d5afc37 typo 2022-02-16 14:18:23 -06:00
smilerz
57dec86b06 handle empty ingredient list when pasting 2022-02-16 14:17:41 -06:00
smilerz
d68a89a32c catch empty lines in paste_ingredients 2022-02-16 14:07:56 -06:00
smilerz
8b94bf1333 retain order of pasted ingredients 2022-02-16 13:22:53 -06:00
MaxJa4
539578c965 Add check for SECRET_KEY and POSTGRES_PASSWORD 2022-02-16 18:57:25 +01:00
MaxJa4
124a8687f1 Merge branch 'TandoorRecipes:develop' into improvement/check_nginx_config 2022-02-16 18:16:01 +01:00
vabene1111
de1efcb81e Merge pull request #1540 from TandoorRecipes/dependabot/npm_and_yarn/vue/follow-redirects-1.14.8 
Bump follow-redirects from 1.14.7 to 1.14.8 in /vue
 2022-02-16 17:04:46 +01:00
smilerz
ad6d99800e include note from ingredient API 2022-02-16 08:35:04 -06:00
dependabot[bot]
90b4ecb599 Bump follow-redirects from 1.14.7 to 1.14.8 in /vue 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-15 02:38:12 +00:00
smilerz
57658e76f5 fix duplicate shopping recipes when auto-add enabled 2022-02-14 17:47:17 -06:00
smilerz
19708dbc64 paste list of ingredients 2022-02-14 17:28:16 -06:00
MaxJa4
b9f16c3f66 Inverted truth check for GUNICORN_MEDIA 2022-02-14 16:45:37 +01:00
MaxJa4
c90de725b0 Only show warning if not using gunicorn 2022-02-14 16:16:45 +01:00
MaxJa4
c0b43987dd Added extistence check for nginx config file. 2022-02-14 16:13:16 +01:00
vabene1111
3db55cd82b added sub path nginx example 2022-02-11 14:16:22 +01:00
vabene1111
3e9de4c392 compiled translations 2022-02-11 09:31:37 +01:00
vabene1111
1e9f7af017 updated translations and django version 2022-02-11 09:29:28 +01:00
vabene1111
cd99b9dc34 Merge pull request #849 from cschmatzler/develop 
Allow specifying port through TANDOOR_PORT environment variable
 2022-02-11 09:17:46 +01:00
vabene1111
b182a9962c Merge branch 'develop' into develop 2022-02-11 09:17:31 +01:00
vabene1111
9b5cc3deaa Merge pull request #1496 from poggenpower/develop 
K8s deployment: Small fix for dupplicate entries.
 2022-02-11 09:05:36 +01:00
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
smilerz
f933226c5d enable logging for LDAP 2022-02-09 16:19:51 -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
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
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
88b3ba1427 various fixes 2022-02-08 08:13:16 -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
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
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