Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 (2b930cda) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 2b930cda authored 4 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0

parents 529f329b f3b8f39b

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/user/imp/ImportStep00.java 10 additions, 10 deletions

src/main/java/org/olat/admin/user/imp/ImportStep00.java
src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java 11 additions, 7 deletions

...ava/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
src/main/java/org/olat/course/nodes/gta/model/TaskDefinition.java 19 additions, 0 deletions

.../java/org/olat/course/nodes/gta/model/TaskDefinition.java
src/main/java/org/olat/course/nodes/gta/ui/AbstractAssignmentEditController.java 4 additions, 2 deletions

...course/nodes/gta/ui/AbstractAssignmentEditController.java
src/main/java/org/olat/course/nodes/gta/ui/GTAAssignmentEditController.java 3 additions, 1 deletion

...olat/course/nodes/gta/ui/GTAAssignmentEditController.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentTestSessionDetailsNumberRenderer.java 19 additions, 0 deletions

...omponents/AssessmentTestSessionDetailsNumberRenderer.java
src/main/java/org/olat/modules/lecture/LectureBlock.java 6 additions, 0 deletions

src/main/java/org/olat/modules/lecture/LectureBlock.java
src/main/java/org/olat/modules/lecture/LectureService.java 1 addition, 1 deletion

src/main/java/org/olat/modules/lecture/LectureService.java
src/main/java/org/olat/modules/lecture/manager/LectureBlockRollCallDAO.java 5 additions, 11 deletions

...olat/modules/lecture/manager/LectureBlockRollCallDAO.java
src/main/java/org/olat/modules/lecture/manager/LectureServiceImpl.java 5 additions, 17 deletions

.../org/olat/modules/lecture/manager/LectureServiceImpl.java
src/main/java/org/olat/modules/lecture/model/LectureBlockAndRollCall.java 1 addition, 5 deletions

...g/olat/modules/lecture/model/LectureBlockAndRollCall.java
src/main/java/org/olat/modules/lecture/model/LectureBlockImpl.java 11 additions, 0 deletions

...java/org/olat/modules/lecture/model/LectureBlockImpl.java
src/main/java/org/olat/modules/lecture/ui/SingleParticipantRollCallsController.java 7 additions, 12 deletions

...ules/lecture/ui/SingleParticipantRollCallsController.java
src/main/java/org/olat/modules/lecture/ui/TeacherRollCallController.java 2 additions, 5 deletions

...rg/olat/modules/lecture/ui/TeacherRollCallController.java
src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_de.properties 4 additions, 0 deletions

.../olat/modules/lecture/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_en.properties 5 additions, 1 deletion

.../olat/modules/lecture/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/lecture/ui/_i18n/LocalStrings_fr.properties 5 additions, 1 deletion

.../olat/modules/lecture/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/lecture/ui/coach/AbsenceNoticesListController.java 5 additions, 3 deletions

...odules/lecture/ui/coach/AbsenceNoticesListController.java
src/main/java/org/olat/modules/lecture/ui/coach/AbsenceNoticesListTableModel.java 2 additions, 7 deletions

...odules/lecture/ui/coach/AbsenceNoticesListTableModel.java
src/main/java/org/olat/modules/lecture/ui/coach/EditDatesLecturesEntriesController.java 6 additions, 2 deletions

.../lecture/ui/coach/EditDatesLecturesEntriesController.java

with 131 additions and 85 deletions

Please register or to comment