Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into add-django-axes
Rohan Karan5bb9ebe9ac59
diff --cc requirements.txtindex a96fc6e80,1e39aaece..f6bea32b8--- a/requirements.txt+++ b/requirements.txt@@@ -8,8 -8,10 +8,11 @@@ django-bootstrap-breadcrumbs~=0.django-formtools~=2.4django-recaptcha~=3.0.0Django~=3.2+ django-activity-stream~=1.4+django-axes==5.39.0django-crispy-forms~=1.14+ django-simple-history~=3.1+ django-email-verification~=0.1.0django_compressor~=4.1django_extensions~=3.2django-storages~=1.13diff --cc wger/core/views/user.pyindex c6ebe3cdf,7ecd69be8..6bfd6c2a3--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@@ -281,9 -282,15 +282,16 @@@ def registration(request)config.save()user.userprofile.save()- user = authenticate(username=username, password=password)++ user = authenticate(request=request, username=username, password=password)++ # Log the user indjango_login(request, user)++ # Email the user with the activation link+ send_email(user)++ # Redirect to the dashboardmessages.success(request, _('You were successfully registered'))return HttpResponseRedirect(reverse('core:dashboard'))else:diff --cc wger/settings_global.pyindex 67b7ddae0,056ebae47..62c6e6288--- a/wger/settings_global.py+++ b/wger/settings_global.py@@@ -89,8 -89,17 +89,20 @@@ INSTALLED_APPS =# CORS'corsheaders',+ # Django Axes- 'axes'++ 'axes',+++ # History keeping+ 'simple_history',++ # Django email verification+ 'django_email_verification',++ # Activity stream+ 'actstream',++ # Fontawesome+ 'fontawesomefree',)MIDDLEWARE = (@@@ -114,8 -123,8 +126,11 @@@'django.middleware.clickjacking.XFrameOptionsMiddleware','django.middleware.locale.LocaleMiddleware',+ # History keeping+ 'simple_history.middleware.HistoryRequestMiddleware',+++ # Django Axes+ 'axes.middleware.AxesMiddleware',)AUTHENTICATION_BACKENDS = (