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

Commit dd22c777 authored 4 years ago by User expired

Browse files

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

parents 1a23f2c2 a7be519e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 1 addition, 1 deletion

pom.xml
src/main/java/org/olat/course/nodes/iq/ExtraTimeInfos.java 7 additions, 1 deletion

src/main/java/org/olat/course/nodes/iq/ExtraTimeInfos.java
src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java 26 additions, 11 deletions

...t/course/nodes/iq/IQIdentityListCourseNodeController.java
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityListController.java 9 additions, 1 deletion

...qti21/ui/assessment/CorrectionIdentityListController.java
src/main/java/org/olat/ims/qti21/ui/assessment/components/AutoCorrectedFlexiCellRenderer.java 12 additions, 2 deletions

...assessment/components/AutoCorrectedFlexiCellRenderer.java
src/main/java/org/olat/ims/qti21/ui/assessment/components/CorrectedFlexiCellRenderer.java 13 additions, 3 deletions

.../ui/assessment/components/CorrectedFlexiCellRenderer.java
src/main/java/org/olat/ims/qti21/ui/assessment/model/CorrectionIdentityRow.java 31 additions, 0 deletions

.../ims/qti21/ui/assessment/model/CorrectionIdentityRow.java
src/main/java/org/olat/modules/bigbluebutton/manager/BigBlueButtonOpenCastRecordingsHandler.java 1 addition, 1 deletion

...utton/manager/BigBlueButtonOpenCastRecordingsHandler.java
src/main/java/org/olat/modules/opencast/OpencastModule.java 13 additions, 0 deletions

src/main/java/org/olat/modules/opencast/OpencastModule.java
src/main/java/org/olat/modules/opencast/OpencastService.java 2 additions, 1 deletion

src/main/java/org/olat/modules/opencast/OpencastService.java
src/main/java/org/olat/modules/opencast/manager/OpencastServiceImpl.java 8 additions, 2 deletions

...rg/olat/modules/opencast/manager/OpencastServiceImpl.java
src/main/java/org/olat/modules/opencast/manager/client/OpencastRestClient.java 60 additions, 0 deletions

...t/modules/opencast/manager/client/OpencastRestClient.java
src/main/java/org/olat/modules/opencast/manager/client/SearchResult.java 45 additions, 0 deletions

...rg/olat/modules/opencast/manager/client/SearchResult.java
src/main/java/org/olat/modules/opencast/manager/client/SearchResults.java 43 additions, 0 deletions

...g/olat/modules/opencast/manager/client/SearchResults.java
src/main/java/org/olat/modules/opencast/ui/OpencastAdminController.java 11 additions, 0 deletions

...org/olat/modules/opencast/ui/OpencastAdminController.java
src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_de.properties 3 additions, 1 deletion

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

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

...olat/modules/opencast/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_it.properties 0 additions, 1 deletion

...olat/modules/opencast/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_pt_BR.properties 0 additions, 1 deletion

...t/modules/opencast/ui/_i18n/LocalStrings_pt_BR.properties

with 288 additions and 28 deletions

Please register or to comment