trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix web after merge 

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
This commit is contained in:
Marc 'risson' Schmitt 2024-01-10 18:16:27 +01:00
parent 4c4459d44e
commit 067e7f923a
No known key found for this signature in database
GPG Key ID: 9C3FA22FABF1AA8D
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyproject.toml
View File

@ -134,7 +134,6 @@ django-model-utils = "*"
django-prometheus = "*" django-prometheus = "*"
django-redis = "*" django-redis = "*"
django-storages = { extras = ["s3"], version = "*" } django-storages = { extras = ["s3"], version = "*" }
# See https://github.com/django-tenants/django-tenants/pull/959
# See https://github.com/django-tenants/django-tenants/pull/997 # See https://github.com/django-tenants/django-tenants/pull/997
django-tenants = { git = "https://github.com/rissson/django-tenants.git", branch="authentik-fixes" } django-tenants = { git = "https://github.com/rissson/django-tenants.git", branch="authentik-fixes" }
djangorestframework = "*" djangorestframework = "*"

6
web/src/user/user-settings/details/UserSettingsFlowExecutor.ts
View File

@ -38,12 +38,6 @@ export class UserSettingsFlowExecutor
@property() @property()
flowSlug?: string; flowSlug?: string;
<<<<<<< HEAD
@state()
brand?: CurrentBrand;
=======
>>>>>>> main
private _challenge?: ChallengeTypes; private _challenge?: ChallengeTypes;
@property({ attribute: false }) @property({ attribute: false })