Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix U2F sub-dependency #315

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Fix U2F sub-dependency #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd981d6
Fix U2F subdependencies in fork
rechner Feb 29, 2024
adb5333
Minor changes rattling around in my branch
rechner Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/furthemore/apis:apis-base-3ba493b
FROM ghcr.io/furthemore/apis:apis-base-11fb148

LABEL org.opencontainers.image.source="https://github.com/furthemore/APIS"

Expand Down
2 changes: 1 addition & 1 deletion fm_eventmanager/settings.py.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ INSTALLED_APPS = [
'django.contrib.sites',
'widget_tweaks',
'mathfilters',
'nested_inline',
'import_export',
'django_extensions',
'django_u2f',
'maintenance_mode',
'registration',
'nested_inline',
'debug_toolbar',
'django_prometheus',
]
Expand Down
9 changes: 9 additions & 0 deletions registration/tests/test_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import unittest

from django.core.management import call_command


class TestTemplates(unittest.TestCase):
def test_validate_templates(self):
call_command("validate_templates")
# This throws an error if it fails to validate
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ django-nested-inline~=0.4.6
django-prometheus~=2.3.1
django-redis~=5.4.0
#django-u2f~=1.0.1
git+https://github.com/gavinwahl/django-u2f.git@34410af
git+https://github.com/rechner/django-u2f.git@23022f8
django-widget-tweaks==1.5.0
freezegun==1.4.0
influxdb~=5.3.1 # Influx < v1.7
Expand Down
Loading