Merge branch 'develop' into 'main'
v1.7.4 See merge request !60
Showing
- LabCourse/api/admin.py 9 additions, 2 deletionsLabCourse/api/admin.py
- LabCourse/api/migrations/0047_alter_report_date.py 18 additions, 0 deletionsLabCourse/api/migrations/0047_alter_report_date.py
- LabCourse/api/models.py 1 addition, 1 deletionLabCourse/api/models.py
- LabCourse/frontend/urls.py 4 additions, 3 deletionsLabCourse/frontend/urls.py
- LabCourse/mylab/email.py 1 addition, 1 deletionLabCourse/mylab/email.py
- LabCourse/mylab/templates/mylab/appointment_requests.html 49 additions, 45 deletionsLabCourse/mylab/templates/mylab/appointment_requests.html
- LabCourse/mylab/templates/mylab/examiner_link.html 9 additions, 0 deletionsLabCourse/mylab/templates/mylab/examiner_link.html
- LabCourse/mylab/templates/mylab/examiner_link_list.html 2 additions, 0 deletionsLabCourse/mylab/templates/mylab/examiner_link_list.html
- LabCourse/mylab/templates/mylab/finished_reports.html 40 additions, 0 deletionsLabCourse/mylab/templates/mylab/finished_reports.html
- LabCourse/mylab/templates/mylab/finished_reports_admin.html 42 additions, 0 deletionsLabCourse/mylab/templates/mylab/finished_reports_admin.html
- LabCourse/mylab/templates/mylab/pending_reports.html 54 additions, 0 deletionsLabCourse/mylab/templates/mylab/pending_reports.html
- LabCourse/mylab/templates/mylab/tutor_link.html 9 additions, 0 deletionsLabCourse/mylab/templates/mylab/tutor_link.html
- LabCourse/mylab/templates/mylab/tutor_link_list.html 2 additions, 0 deletionsLabCourse/mylab/templates/mylab/tutor_link_list.html
- LabCourse/mylab/templates/mylab/upcoming_appointments.html 9 additions, 12 deletionsLabCourse/mylab/templates/mylab/upcoming_appointments.html
- LabCourse/mylab/templates/mylab/user_home.html 4 additions, 219 deletionsLabCourse/mylab/templates/mylab/user_home.html
- LabCourse/mylab/templates/mylab/user_link.html 9 additions, 0 deletionsLabCourse/mylab/templates/mylab/user_link.html
- LabCourse/mylab/templates/mylab/user_link_list.html 2 additions, 0 deletionsLabCourse/mylab/templates/mylab/user_link_list.html
- LabCourse/mylab/templatetags/finished_reports.py 32 additions, 0 deletionsLabCourse/mylab/templatetags/finished_reports.py
- LabCourse/mylab/templatetags/pending_reports.py 19 additions, 0 deletionsLabCourse/mylab/templatetags/pending_reports.py
- LabCourse/mylab/templatetags/user_link.py 34 additions, 0 deletionsLabCourse/mylab/templatetags/user_link.py
Loading
Please register or sign in to comment