Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

LabCourse
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

da1a8001

Commit da1a8001 authored 2 years ago by Tim-Oliver Husser

Downloads
- Plain Diff

Merge branch 'develop' into 'main'

v1.9.0

See merge request !70

parents 3725acb5 9b2d9aa4

1 merge request!70v1.9.0

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

LabCourse/api/urls.py 2 additions, 1 deletion

LabCourse/api/urls.py
LabCourse/api/views.py 45 additions, 2 deletions

LabCourse/api/views.py
LabCourse/mylab/templates/mylab/base.html 1 addition, 0 deletions

LabCourse/mylab/templates/mylab/base.html
LabCourse/mylab_admin/templates/mylab_admin/search_user.html 84 additions, 0 deletions

LabCourse/mylab_admin/templates/mylab_admin/search_user.html
LabCourse/mylab_admin/urls.py 2 additions, 0 deletions

LabCourse/mylab_admin/urls.py
LabCourse/mylab_admin/views.py 9 additions, 0 deletions

LabCourse/mylab_admin/views.py
LabCourse/mylab_tutor/templates/mylab_tutor/add_appointment.html 0 additions, 2 deletions

...se/mylab_tutor/templates/mylab_tutor/add_appointment.html
pyproject.toml 1 addition, 1 deletion

pyproject.toml

with 144 additions and 6 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