Merge branch 'main' into '107-add-hedgedoc'
# Conflicts: # deployment/helmchart/Chart.yaml
No related branches found
No related tags found
Showing
- CHANGELOG.md 18 additions, 0 deletionsCHANGELOG.md
- README.md 24 additions, 4 deletionsREADME.md
- backend/Dockerfile 12 additions, 8 deletionsbackend/Dockerfile
- backend/app.py 0 additions, 2 deletionsbackend/app.py
- backend/areas/__init__.py 11 additions, 1 deletionbackend/areas/__init__.py
- backend/areas/apps/apps.py 1 addition, 0 deletionsbackend/areas/apps/apps.py
- backend/areas/apps/apps_service.py 14 additions, 13 deletionsbackend/areas/apps/apps_service.py
- backend/areas/roles/role_service.py 3 additions, 2 deletionsbackend/areas/roles/role_service.py
- backend/areas/users/user_service.py 26 additions, 20 deletionsbackend/areas/users/user_service.py
- backend/areas/users/users.py 1 addition, 1 deletionbackend/areas/users/users.py
- backend/cliapp/cliapp/cli.py 17 additions, 26 deletionsbackend/cliapp/cliapp/cli.py
- backend/cluster_config.py 13 additions, 13 deletionsbackend/cluster_config.py
- backend/config.py 3 additions, 0 deletionsbackend/config.py
- backend/helpers/kratos_user.py 19 additions, 19 deletionsbackend/helpers/kratos_user.py
- backend/requirements.txt 5 additions, 5 deletionsbackend/requirements.txt
- backend/web/login/login.py 138 additions, 62 deletionsbackend/web/login/login.py
- backend/web/static/base.js 111 additions, 26 deletionsbackend/web/static/base.js
- backend/web/static/style.css 22 additions, 2 deletionsbackend/web/static/style.css
- backend/web/templates/base.html 2 additions, 2 deletionsbackend/web/templates/base.html
- backend/web/templates/login.html 63 additions, 2 deletionsbackend/web/templates/login.html
Loading
Please register or sign in to comment