Merge branch 'devel' into 'master'

Include fix for #89

See merge request oliver/ivatar!215

ivatar/ivataraccount/views.py

@@ -1080,10 +1080,9 @@ class PasswordResetView(PasswordResetViewOriginal):
             user = None
 
             # Try to find the user via the normal user class
-            try:
-                user = User.objects.get(email=request.POST["email"])
-            except ObjectDoesNotExist:
-                pass
+            # TODO: How to handle the case that multiple user accounts
+            # could have the same password set?
+            user = User.objects.filter(email=request.POST["email"]).first()
 
             # If we didn't find the user in the previous step,
             # try the ConfirmedEmail class instead.

requirements.txt

@@ -12,6 +12,7 @@ django-user-accounts
 email-validator
 fabric
 flake8-respect-noqa
+git+https://github.com/daboth/pagan.git
 git+https://github.com/ercpe/pydenticon5.git
 git+https://github.com/flavono123/identicon.git
 git+https://github.com/ofalk/django-openid-auth
@@ -19,7 +20,6 @@ git+https://github.com/ofalk/monsterid.git
 git+https://github.com/ofalk/Robohash.git@devel
 mysqlclient
 notsetuptools
-pagan
 Pillow
 pip
 psycopg2-binary