Merge branch 'main' into 119-as-admin-create-recovery-links-from-dashboard (96354b8c) · Commits · stackspin / dashboard · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dashboard
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Model experiments

Snippets Groups Projects

Admin message

Due to spam, we had to disable registrations and GitHub login. Please reach out to us at support@greenhost.net if you want to contribute.

96354b8c

Commit 96354b8c authored 2 years ago by Mart van Santen

Downloads
- Plain Diff

Merge branch 'main' into 119-as-admin-create-recovery-links-from-dashboard

parents 4197fde5 950a8fa1

No related branches found

No related tags found

1 merge request!94Resolve "As admin, create recovery links from dashboard"

Pipeline #38384 passed with stages

in 4 minutes and 51 seconds

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

README.md 2 additions, 1 deletion

README.md
backend/areas/users/users.py 1 addition, 1 deletion

backend/areas/users/users.py
backend/config.py 2 additions, 0 deletions

backend/config.py
backend/web/login/login.py 15 additions, 2 deletions

backend/web/login/login.py
backend/web/static/base.js 3 additions, 0 deletions

backend/web/static/base.js
backend/web/templates/login.html 58 additions, 0 deletions

backend/web/templates/login.html
docker-compose.yml 4 additions, 4 deletions

docker-compose.yml
frontend/src/components/UserModal/UserModal.tsx 5 additions, 0 deletions

frontend/src/components/UserModal/UserModal.tsx
frontend/src/services/auth/redux/selectors.ts 0 additions, 1 deletion

frontend/src/services/auth/redux/selectors.ts
renovate.json 8 additions, 1 deletion

renovate.json

with 98 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment