Merge OpenOLAT 12.2 to OpenOLAT default branch with 7ad87ef98dc4e26872f03dc02be59226664923ba (73fc46fc) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

73fc46fc

Commit 73fc46fc authored 7 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 12.2 to OpenOLAT default branch with 7ad87ef98dc4e26872f03dc02be59226664923ba

parents 796ee91a e74dd4b6

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/services/video/MovieService.java 10 additions, 2 deletions

...va/org/olat/core/commons/services/video/MovieService.java
src/main/java/org/olat/core/commons/services/video/MovieServiceImpl.java 27 additions, 0 deletions

...rg/olat/core/commons/services/video/MovieServiceImpl.java
src/main/java/org/olat/modules/video/VideoManager.java 6 additions, 4 deletions

src/main/java/org/olat/modules/video/VideoManager.java
src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java 11 additions, 7 deletions

...java/org/olat/modules/video/manager/VideoManagerImpl.java
src/main/java/org/olat/modules/video/ui/VideoPosterEditController.java 33 additions, 28 deletions

.../org/olat/modules/video/ui/VideoPosterEditController.java
src/main/java/org/olat/modules/video/ui/VideoPosterSelectionForm.java 83 additions, 55 deletions

...a/org/olat/modules/video/ui/VideoPosterSelectionForm.java
src/main/java/org/olat/modules/video/ui/VideoPosterUploadForm.java 10 additions, 4 deletions

...java/org/olat/modules/video/ui/VideoPosterUploadForm.java
src/main/java/org/olat/modules/video/ui/_content/video_poster_proposal.html 3 additions, 3 deletions

...olat/modules/video/ui/_content/video_poster_proposal.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 2 additions, 0 deletions

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

with 186 additions and 103 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment