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

Commit 69b73da4 authored 4 years ago by User expired

Browse files

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

parents d257ca03 25bed9cb

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/UsermanagerUserSearchForm.java 4 additions, 0 deletions

...n/java/org/olat/admin/user/UsermanagerUserSearchForm.java
src/main/java/org/olat/core/commons/services/pdf/dispatcher/PdfDeliveryDispatcher.java 40 additions, 27 deletions

...ommons/services/pdf/dispatcher/PdfDeliveryDispatcher.java
src/main/java/org/olat/core/commons/services/pdf/manager/AthenaPdfSPI.java 5 additions, 1 deletion

.../olat/core/commons/services/pdf/manager/AthenaPdfSPI.java
src/main/java/org/olat/core/commons/services/pdf/model/PdfDelivery.java 22 additions, 1 deletion

...org/olat/core/commons/services/pdf/model/PdfDelivery.java
src/main/java/org/olat/course/learningpath/ui/_i18n/LocalStrings_it.properties 4 additions, 0 deletions

...t/course/learningpath/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/nodes/opencast/ui/OpencastConfigController.java 20 additions, 0 deletions

...at/course/nodes/opencast/ui/OpencastConfigController.java
src/main/java/org/olat/course/nodes/opencast/ui/_i18n/LocalStrings_de.properties 3 additions, 0 deletions

...course/nodes/opencast/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/opencast/ui/_i18n/LocalStrings_en.properties 3 additions, 0 deletions

...course/nodes/opencast/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/run/_i18n/LocalStrings_it.properties 5 additions, 0 deletions

...java/org/olat/course/run/_i18n/LocalStrings_it.properties
src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java 5 additions, 3 deletions

...g/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonManagerImpl.java 3 additions, 3 deletions

...dules/bigbluebutton/manager/BigBlueButtonManagerImpl.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonOpenCastRecordingsHandler.java 11 additions, 10 deletions

...utton/manager/BigBlueButtonOpenCastRecordingsHandler.java
src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/ceditor/ui/ImageRunController.java 3 additions, 1 deletion

.../java/org/olat/modules/ceditor/ui/ImageRunController.java
src/main/java/org/olat/modules/ceditor/ui/PageController.java 1 addition, 1 deletion

...main/java/org/olat/modules/ceditor/ui/PageController.java
src/main/java/org/olat/modules/ceditor/ui/PageRunControllerElement.java 9 additions, 1 deletion

...org/olat/modules/ceditor/ui/PageRunControllerElement.java
src/main/java/org/olat/modules/ceditor/ui/component/PageFragmentsComponent.java 15 additions, 1 deletion

.../modules/ceditor/ui/component/PageFragmentsComponent.java
src/main/java/org/olat/modules/portfolio/ui/media/VideoMediaController.java 4 additions, 2 deletions

...olat/modules/portfolio/ui/media/VideoMediaController.java
src/main/java/org/olat/modules/quality/generator/manager/QualityGeneratorServiceImpl.java 3 additions, 2 deletions

...uality/generator/manager/QualityGeneratorServiceImpl.java
src/main/java/org/olat/modules/quality/generator/provider/courselectures/CourseLecturesFollowUpProvider.java 23 additions, 2 deletions

...ovider/courselectures/CourseLecturesFollowUpProvider.java

with 184 additions and 56 deletions

Please register or to comment