Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

DataCatalog
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

6d07735e

Commit 6d07735e authored 3 years ago by Christian Boettcher

Downloads
- Plain Diff

Merge branch 'master' into mptest

parents b30bb185 f301702f

No related branches found

No related tags found

Loading

Pipeline #71846 failed 3 years ago

Changes 14
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
.gitlab-ci.yml 17 additions, 1 deletion

.gitlab-ci.yml
README.md 16 additions, 1 deletion

README.md
apiserver/main.py 19 additions, 12 deletions

apiserver/main.py
apiserver/storage/JsonFileStorageAdapter.py 15 additions, 2 deletions

apiserver/storage/JsonFileStorageAdapter.py
apiserver/storage/__init__.py 1 addition, 1 deletion

apiserver/storage/__init__.py
client/1.json 32 additions, 1 deletion

client/1.json
frontend/createStatic.py 29 additions, 4 deletions

frontend/createStatic.py
frontend/js/apicalls.js 65 additions, 27 deletions

frontend/js/apicalls.js
frontend/js/auth.js 15 additions, 9 deletions

frontend/js/auth.js
frontend/templates/login_content.html.jinja 13 additions, 0 deletions

frontend/templates/login_content.html.jinja
tests/apiserver_tests/test_apiwithauth.py 22 additions, 4 deletions

tests/apiserver_tests/test_apiwithauth.py
tests/apiserver_tests/test_responsiveness.py 12 additions, 3 deletions

tests/apiserver_tests/test_responsiveness.py
tests/storage_tests/test_jsonbackend.py 8 additions, 2 deletions

tests/storage_tests/test_jsonbackend.py

with 265 additions and 67 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