Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (d9f365ae) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit d9f365ae authored 5 years ago by srosse

Browse files

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents d6a5adb8 0b8b55f5

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

NOTICE.TXT 2 additions, 1 deletion

NOTICE.TXT
src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html 2 additions, 0 deletions

...at/core/commons/fullWebApp/_content/fullwebapplayout.html
src/main/java/org/olat/course/nodes/livestream/paella/PaellaFactory.java 78 additions, 0 deletions

...rg/olat/course/nodes/livestream/paella/PaellaFactory.java
src/main/java/org/olat/course/nodes/livestream/paella/PaellaMapper.java 142 additions, 0 deletions

...org/olat/course/nodes/livestream/paella/PaellaMapper.java
src/main/java/org/olat/course/nodes/livestream/paella/Source.java 49 additions, 0 deletions

.../java/org/olat/course/nodes/livestream/paella/Source.java
src/main/java/org/olat/course/nodes/livestream/paella/Sources.java 52 additions, 0 deletions

...java/org/olat/course/nodes/livestream/paella/Sources.java
src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamRunController.java 1 addition, 1 deletion

...t/course/nodes/livestream/ui/LiveStreamRunController.java
src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamVideoController.java 29 additions, 33 deletions

...course/nodes/livestream/ui/LiveStreamVideoController.java
src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamViewerController.java 3 additions, 2 deletions

...ourse/nodes/livestream/ui/LiveStreamViewerController.java
src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamViewersController.java 14 additions, 13 deletions

...urse/nodes/livestream/ui/LiveStreamViewersController.java
src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamsController.java 12 additions, 4 deletions

...lat/course/nodes/livestream/ui/LiveStreamsController.java
src/main/java/org/olat/course/nodes/livestream/ui/_content/video.html 6 additions, 16 deletions

...a/org/olat/course/nodes/livestream/ui/_content/video.html
src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_de.properties 3 additions, 4 deletions

...urse/nodes/livestream/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_en.properties 1 addition, 2 deletions

...urse/nodes/livestream/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_fr.properties 0 additions, 2 deletions

...urse/nodes/livestream/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_pt_BR.properties 0 additions, 2 deletions

...e/nodes/livestream/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/ims/qti21/model/xml/AssessmentItemFactory.java 5 additions, 5 deletions

...a/org/olat/ims/qti21/model/xml/AssessmentItemFactory.java
src/main/java/org/olat/ims/qti21/model/xml/interactions/FIBAssessmentItemBuilder.java 328 additions, 70 deletions

...ti21/model/xml/interactions/FIBAssessmentItemBuilder.java
src/main/java/org/olat/ims/qti21/ui/editor/AssessmentItemEditorController.java 4 additions, 4 deletions

...t/ims/qti21/ui/editor/AssessmentItemEditorController.java
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties

with 733 additions and 159 deletions

Please register or to comment