diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fe40b48d52b06b44bfd28b12722e96b5023eee39..354f94f5ca0c64840011cae355cd9aefe02f6d0d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,6 +19,8 @@ Changed ~~~~~~~ * Restructure group page and show more information about members. +* django-two-factor-auth >= 1.14.0 is now required due to a + backwards-incompatible breakage in that library Fixed ~~~~~~~ diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index d328512d3d3b64310a6e65df24c70f027a869498..e5e6984a7f4f0fd26c6a64fcf9a1ac73bfbb3c6a 100644 --- a/aleksis/core/settings.py +++ b/aleksis/core/settings.py @@ -144,6 +144,7 @@ INSTALLED_APPS = [ "dynamic_preferences.users.apps.UserPreferencesConfig", "impersonate", "two_factor", + "two_factor.plugins.phonenumber", "material", "ckeditor", "ckeditor_uploader", diff --git a/aleksis/core/templates/two_factor/core/login.html b/aleksis/core/templates/two_factor/core/login.html index 77b135569d797181a45bd49d7fd7e9cded4e9a5c..6145855229d9fec9f15edbd8ee597811250e2140 100644 --- a/aleksis/core/templates/two_factor/core/login.html +++ b/aleksis/core/templates/two_factor/core/login.html @@ -1,6 +1,6 @@ {# -*- engine:django -*- #} {% extends "two_factor/_base_focus.html" %} -{% load i18n two_factor account socialaccount %} +{% load i18n phonenumber account socialaccount %} {% block browser_title %} {% trans "Login" %} diff --git a/aleksis/core/templates/two_factor/profile/profile.html b/aleksis/core/templates/two_factor/profile/profile.html index dd9472e7fb9a09051b35d7be57f59dcab1549dae..fe96135d0dfae6fd16ffad4fece50148115c8b69 100644 --- a/aleksis/core/templates/two_factor/profile/profile.html +++ b/aleksis/core/templates/two_factor/profile/profile.html @@ -1,5 +1,5 @@ {% extends "two_factor/_base_focus.html" %} -{% load i18n two_factor %} +{% load i18n phonenumber %} {% block browser_title %} {% trans "Account Security" %} diff --git a/pyproject.toml b/pyproject.toml index b492b58bcf6d32c8bccbfd0360737605fcddad49..254c67a90df350d007e41da6ad55c0fae9b8732e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,7 +71,7 @@ django-ipware = "^4.0" django-impersonate = "^1.4" psycopg2 = "^2.8" django_select2 = "^7.1" -django-two-factor-auth = { version = "^1.12.1", extras = [ "yubikey", "phonenumbers", "call", "sms" ] } +django-two-factor-auth = { version = "^1.14.0", extras = [ "yubikey", "phonenumbers", "call", "sms" ] } django-yarnpkg = "^6.0" django-material = "^1.6.0" django-dynamic-preferences = "^1.11"