diff --git a/AUTHORS.rst b/AUTHORS.rst index 02293dde5..f3f465eed 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -75,9 +75,11 @@ Developers * Gabriel Liss - https://github.com/gabeliss * Alexandra Rhodes - https://github.com/arhodes130 * Jayanth Bontha - https://github.com/JayanthBontha +* Roelof Rietbroek https://github.com/strawpants * Ethan Winters - https://github.com/ebwinters * Dieter Plaetinck - https://github.com/Dieterbe + Translators ----------- diff --git a/extras/docker/development/settings.py b/extras/docker/development/settings.py index c0b434929..7107b3b72 100644 --- a/extras/docker/development/settings.py +++ b/extras/docker/development/settings.py @@ -98,6 +98,7 @@ WGER_SETTINGS["SYNC_EXERCISE_IMAGES_CELERY"] = env.bool("SYNC_EXERCISE_IMAGES_CELERY", False) WGER_SETTINGS["SYNC_EXERCISE_VIDEOS_CELERY"] = env.bool("SYNC_EXERCISE_VIDEOS_CELERY", False) WGER_SETTINGS["SYNC_INGREDIENTS_CELERY"] = env.bool("SYNC_INGREDIENTS_CELERY", False) +WGER_SETTINGS["SYNC_OFF_DAILY_DELTA_CELERY"] = env.bool("SYNC_OFF_DAILY_DELTA_CELERY", False) WGER_SETTINGS["USE_RECAPTCHA"] = env.bool("USE_RECAPTCHA", False) WGER_SETTINGS["USE_CELERY"] = env.bool("USE_CELERY", False) diff --git a/extras/open-food-facts/docker-compose.yml b/extras/open-food-facts/docker-compose.yml index 555d08a16..e77e8ba83 100644 --- a/extras/open-food-facts/docker-compose.yml +++ b/extras/open-food-facts/docker-compose.yml @@ -4,7 +4,7 @@ services: ports: - "27017:27017" volumes: - - $PWD/dump:/dump + - $PWD/dump/dump:/dump environment: MONGO_INITDB_ROOT_USERNAME: off MONGO_INITDB_ROOT_PASSWORD: off-wger diff --git a/wger/__init__.py b/wger/__init__.py index 9fb6d18ba..a00e199c0 100644 --- a/wger/__init__.py +++ b/wger/__init__.py @@ -9,9 +9,9 @@ from .celery_configuration import app -MIN_APP_VERSION = (1, 6, 0, 'final', 1) +MIN_APP_VERSION = (1, 7, 3, 'final', 1) -VERSION = (2, 3, 0, 'alpha', 1) +VERSION = (2, 3, 0, 'alpha', 2) RELEASE = True diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html index 830dbf675..4bba8122f 100644 --- a/wger/core/templates/navigation.html +++ b/wger/core/templates/navigation.html @@ -3,7 +3,8 @@
- wger logo + wger logo