Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/ingredient-images
Roland Geider098598895e07
diff --cc extras/docker/development/settings.pyindex f6ce7994b,32bd9110a..866dcfc1d--- a/extras/docker/development/settings.py+++ b/extras/docker/development/settings.py@@@ -132,8 -133,7 +134,13 @@@ SIMPLE_JWT['ACCESS_TOKEN_LIFETIME'] = tSIMPLE_JWT['REFRESH_TOKEN_LIFETIME'] = timedelta(hours=env.int("REFRESH_TOKEN_LIFETIME", 24))SIMPLE_JWT['SIGNING_KEY'] = env.str("SIGNING_KEY", SECRET_KEY)+ #+ # https://docs.djangoproject.com/en/4.1/ref/csrf/+ #+ CSRF_TRUSTED_ORIGINS = env.list("CSRF_TRUSTED_ORIGINS", ['http://127.0.0.1', ])+++#+# Celery message queue configuration+#+CELERY_BROKER_URL = env.str("CELERY_BROKER", "redis://cache:6379/1")+CELERY_RESULT_BACKEND = env.str("CELERY_BACKEND", "redis://cache:6379/1")diff --cc requirements.txtindex 745b37d0c,2ffb2a54e..331a50c6f--- a/requirements.txt+++ b/requirements.txt@@@ -24,9 -27,7 +27,10 @@@ invoke==1.7.pillow==9.3.0reportlab==3.6.12requests==2.28.1+celery==5.2.7+redis==4.3.4+flower==1.2.0+ tzdata==2022.7# AWS