Merge remote-tracking branch 'upstream/OpenOLAT_15.1' into OpenOLAT_15.1.uibk (41725bf2) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 41725bf2 authored 4 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_15.1' into OpenOLAT_15.1.uibk

parents ecf7e2f5 9e31b8f5

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/core/gui/exception/ExceptionWindowController.java 0 additions, 1 deletion

...rg/olat/core/gui/exception/ExceptionWindowController.java
src/main/java/org/olat/core/gui/exception/_content/exception_page.html 6 additions, 8 deletions

.../org/olat/core/gui/exception/_content/exception_page.html
src/main/java/org/olat/course/nodes/IQTESTCourseNode.java 17 additions, 11 deletions

src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
src/main/java/org/olat/course/nodes/iq/ConfirmReopenAssessmentEntriesController.java 19 additions, 0 deletions

...se/nodes/iq/ConfirmReopenAssessmentEntriesController.java
src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java 1 addition, 1 deletion

...rg/olat/course/nodes/iq/QTI21AssessmentRunController.java
src/main/java/org/olat/ims/qti21/QTI21Service.java 1 addition, 1 deletion

src/main/java/org/olat/ims/qti21/QTI21Service.java
src/main/java/org/olat/ims/qti21/manager/QTI21ServiceImpl.java 21 additions, 17 deletions

...ain/java/org/olat/ims/qti21/manager/QTI21ServiceImpl.java
src/main/java/org/olat/ims/qti21/ui/ConfirmAssessmentTestSessionInvalidationController.java 14 additions, 10 deletions

...i/ConfirmAssessmentTestSessionInvalidationController.java
src/main/java/org/olat/ims/qti21/ui/ConfirmAssessmentTestSessionRevalidationController.java 30 additions, 22 deletions

...i/ConfirmAssessmentTestSessionRevalidationController.java
src/main/java/org/olat/ims/qti21/ui/ConfirmReopenAssessmentEntryController.java 19 additions, 0 deletions

.../ims/qti21/ui/ConfirmReopenAssessmentEntryController.java
src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java 2 additions, 2 deletions

...g/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/grading/GradingService.java 2 additions, 2 deletions

src/main/java/org/olat/modules/grading/GradingService.java
src/main/java/org/olat/modules/grading/manager/GradingServiceImpl.java 16 additions, 8 deletions

.../org/olat/modules/grading/manager/GradingServiceImpl.java
src/main/java/org/olat/modules/grading/ui/confirmation/ConfirmReopenAssignmentController.java 1 addition, 1 deletion

...ng/ui/confirmation/ConfirmReopenAssignmentController.java
src/main/java/org/olat/restapi/system/BigBlueButtonStatsWebService.java 19 additions, 0 deletions

...org/olat/restapi/system/BigBlueButtonStatsWebService.java
src/main/java/org/olat/restapi/system/vo/BigBlueButtonStatisticsVO.java 19 additions, 0 deletions

...org/olat/restapi/system/vo/BigBlueButtonStatisticsVO.java
src/test/java/org/olat/modules/grading/manager/GradingServiceTest.java 12 additions, 12 deletions

.../org/olat/modules/grading/manager/GradingServiceTest.java

with 201 additions and 98 deletions

Please register or to comment