Merge branch 'main' into '143-make-dashboard-secret-generation-generic'
# Conflicts: # deployment/helmchart/Chart.yaml # deployment/helmchart/values.yaml
Showing
- CHANGELOG.md 8 additions, 0 deletionsCHANGELOG.md
- README.md 14 additions, 5 deletionsREADME.md
- backend/app.py 1 addition, 0 deletionsbackend/app.py
- backend/areas/auth/auth.py 12 additions, 14 deletionsbackend/areas/auth/auth.py
- backend/areas/users/user_service.py 43 additions, 3 deletionsbackend/areas/users/user_service.py
- backend/areas/users/users.py 13 additions, 1 deletionbackend/areas/users/users.py
- backend/areas/users/validation.py 43 additions, 1 deletionbackend/areas/users/validation.py
- backend/helpers/kratos_user.py 52 additions, 15 deletionsbackend/helpers/kratos_user.py
- backend/web/login/login.py 41 additions, 12 deletionsbackend/web/login/login.py
- backend/web/static/base.js 38 additions, 4 deletionsbackend/web/static/base.js
- deployment/helmchart/CHANGELOG.md 8 additions, 0 deletionsdeployment/helmchart/CHANGELOG.md
- deployment/helmchart/Chart.yaml 2 additions, 2 deletionsdeployment/helmchart/Chart.yaml
- deployment/helmchart/values.yaml 3 additions, 3 deletionsdeployment/helmchart/values.yaml
- docker-compose.yml 5 additions, 5 deletionsdocker-compose.yml
- frontend/package.json 2 additions, 0 deletionsfrontend/package.json
- frontend/public/custom/assets/forgejo.svg 27 additions, 0 deletionsfrontend/public/custom/assets/forgejo.svg
- frontend/public/custom/assets/jitsi.svg 650 additions, 0 deletionsfrontend/public/custom/assets/jitsi.svg
- frontend/public/custom/assets/mattermost.svg 10 additions, 0 deletionsfrontend/public/custom/assets/mattermost.svg
- frontend/public/custom/markdown/forgejo.md 14 additions, 0 deletionsfrontend/public/custom/markdown/forgejo.md
- frontend/public/custom/markdown/jitsi.md 12 additions, 0 deletionsfrontend/public/custom/markdown/jitsi.md
Loading
Please register or sign in to comment