Merge remote-tracking branch 'origin/OpenOLAT_13.2' (7eb47061) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 7eb47061 authored 5 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_13.2'

parents 9eae642c 43c47ecb

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/gui/media/ServletUtil.java 19 additions, 17 deletions

src/main/java/org/olat/core/gui/media/ServletUtil.java
src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_pt_BR.properties 7 additions, 3 deletions

...course/certificate/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...olat/course/config/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...va/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...t/course/nodes/gta/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/members/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

.../course/nodes/members/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...org/olat/group/ui/run/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestFeedbackEditorController.java 8 additions, 2 deletions

...i21/ui/editor/AssessmentTestFeedbackEditorController.java
src/main/java/org/olat/modules/curriculum/ui/_i18n/LocalStrings_pt_BR.properties 3 additions, 1 deletion

...modules/curriculum/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...olat/modules/forms/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/video/VideoManager.java 5 additions, 1 deletion

src/main/java/org/olat/modules/video/VideoManager.java
src/main/java/org/olat/modules/video/VideoMeta.java 2 additions, 0 deletions

src/main/java/org/olat/modules/video/VideoMeta.java
src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java 50 additions, 21 deletions

...java/org/olat/modules/video/manager/VideoManagerImpl.java
src/main/java/org/olat/modules/video/ui/VideoDisplayController.java 2 additions, 1 deletion

...ava/org/olat/modules/video/ui/VideoDisplayController.java
src/main/java/org/olat/modules/video/ui/VideoPosterEditController.java 21 additions, 10 deletions

.../org/olat/modules/video/ui/VideoPosterEditController.java
src/main/java/org/olat/modules/video/ui/VideoResourceEditController.java 62 additions, 10 deletions

...rg/olat/modules/video/ui/VideoResourceEditController.java
src/main/java/org/olat/modules/video/ui/VideoRuntimeController.java 11 additions, 0 deletions

...ava/org/olat/modules/video/ui/VideoRuntimeController.java
src/main/java/org/olat/modules/video/ui/_content/poster_config.html 1 addition, 1 deletion

...ava/org/olat/modules/video/ui/_content/poster_config.html
src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...rg/olat/modules/video/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...rg/olat/modules/video/ui/_i18n/LocalStrings_en.properties

with 201 additions and 73 deletions

Please register or to comment