Merge branch 'master' into python3.11 (a1ace28b) · Commits · SMASCH / scheduling-system · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

scheduling-system
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- External wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

a1ace28b

Commit a1ace28b authored 11 months ago by Carlos Vega

Downloads
- Plain Diff

Merge branch 'master' into python3.11

parents af680c7d c0153f8c

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 7 additions, 2 deletions

CHANGELOG
smash/web/migrations/0212_customstudysubjectfield_tracked.py 18 additions, 0 deletions

smash/web/migrations/0212_customstudysubjectfield_tracked.py
smash/web/models/custom_data/custom_study_subject_field.py 2 additions, 0 deletions

smash/web/models/custom_data/custom_study_subject_field.py
smash/web/templates/includes/custom_study_subject_field_box.html 2 additions, 0 deletions

...eb/templates/includes/custom_study_subject_field_box.html
smash/web/tests/forms/test_CustomStudySubjectFieldAddForm.py 4 additions, 1 deletion

smash/web/tests/forms/test_CustomStudySubjectFieldAddForm.py
smash/web/tests/forms/test_CustomStudySubjectFieldEditForm.py 4 additions, 1 deletion

...h/web/tests/forms/test_CustomStudySubjectFieldEditForm.py
smash/web/tests/models/test_study_subject.py 27 additions, 0 deletions

smash/web/tests/models/test_study_subject.py
smash/web/tests/view/test_subjects.py 92 additions, 1 deletion

smash/web/tests/view/test_subjects.py
smash/web/views/subject.py 41 additions, 21 deletions

smash/web/views/subject.py

with 197 additions and 26 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