- Downloads
[AllowTeachersToJoinCourse] fix conflicts
Signed-off-by:
Henry Page <h.page@student.tudelft.nl>
No related branches found
No related tags found
Showing
- .gitlab/issue_templates/Bug.md 0 additions, 25 deletions.gitlab/issue_templates/Bug.md
- .gitlab/issue_templates/Feature.md 0 additions, 11 deletions.gitlab/issue_templates/Feature.md
- .gitlab/merge_request_templates/Bug.md 0 additions, 10 deletions.gitlab/merge_request_templates/Bug.md
- .gitlab/merge_request_templates/Feature.md 0 additions, 15 deletions.gitlab/merge_request_templates/Feature.md
- CHANGELOG.md 11 additions, 1 deletionCHANGELOG.md
- build.gradle.kts 1 addition, 1 deletionbuild.gradle.kts
- src/main/java/nl/tudelft/queue/controller/LabController.java 77 additions, 6 deletionssrc/main/java/nl/tudelft/queue/controller/LabController.java
- src/main/java/nl/tudelft/queue/service/EditionStatusService.java 15 additions, 26 deletions...n/java/nl/tudelft/queue/service/EditionStatusService.java
- src/main/resources/templates/lab/create/components/lab-general.html 10 additions, 0 deletions...esources/templates/lab/create/components/lab-general.html
- src/main/resources/templates/lab/view/components/lab-info.html 43 additions, 9 deletions...ain/resources/templates/lab/view/components/lab-info.html
- src/test/java/nl/tudelft/queue/controller/LabControllerTest.java 21 additions, 0 deletions...t/java/nl/tudelft/queue/controller/LabControllerTest.java
- src/test/java/test/TestDatabaseLoader.java 9 additions, 5 deletionssrc/test/java/test/TestDatabaseLoader.java
Loading
Please sign in to comment
