inventree/InvenTree
2
0 Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-10-05 18:01:14 +00:00
Code Activity

fix merge

Browse Source
This commit is contained in:
Matthias Mair committed 2024-12-23 00:31:06 +01:00
1 parent 043bc88086
commit e9c20a454b
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/backend/InvenTree/InvenTree/urls.py
+1 -1
View File
@@ -140,7 +140,7 @@ apipatterns = [
# SocialAccountDisconnectView.as_view(), # SocialAccountDisconnectView.as_view(),
# name='social_account_disconnect', # name='social_account_disconnect',
# ), # ),
path('login/', users.api.Login.as_view(), name='api-login'), # path('login/', users.api.Login.as_view(), name='api-login'),
path('logout/', users.api.Logout.as_view(), name='api-logout'), path('logout/', users.api.Logout.as_view(), name='api-logout'),
path( path(
'login-redirect/', 'login-redirect/',
src/backend/InvenTree/users/migrations/0012_migrate_mfa_20240408_1659.py → src/backend/InvenTree/users/migrations/0013_migrate_mfa_20240408_1659.py
+1 -1
View File
@@ -38,7 +38,7 @@ def move_mfa(apps, schema_editor):
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [('users', '0011_auto_20240523_1640'), dependencies = [('users', '0012_alter_ruleset_can_view'),
('otp_static', '0002_throttling'), ('otp_static', '0002_throttling'),
('otp_totp', '0002_auto_20190420_0723'), ('otp_totp', '0002_auto_20190420_0723'),
('mfa', '0002_authenticator_timestamps'),] ('mfa', '0002_authenticator_timestamps'),]