Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into feature/exercise-crowdsourcing

Roland Geider48ca4e94bfc8
diff --cc extras/docker/development/settings.py
index 64246704d,04859e43d..e53a82157
--- a/extras/docker/development/settings.py
+++ b/extras/docker/development/settings.py
@@@ -102,5 -102,5 +102,8 @@@ if os.environ.get("DJANGO_CACHE_BACKEND
}
}
+ # Folder for compressed CSS and JS files
+ COMPRESS_ROOT = STATIC_ROOT
++
+# The site's domain as used by the email verification workflow
+EMAIL_PAGE_DOMAIN = 'http://localhost/'
diff --cc requirements_dev.txt
index 4c0388ca9,b7b661119..3bf44735c
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@@ -9,13 -9,10 +9,13 @@@
wheel==0.37.1
# for ingredient import script from OFF
- pymongo==4.0.1
+ pymongo==4.0.2
+# for ingredient import script from OFF
+pymongo==3.12.1
+
# Development packages
- coverage==6.3.1
+ coverage==6.3.2
django-debug-toolbar==3.2.4
tblib==1.7.0
isort==5.10.1