Merge remote-tracking branch 'upstream/OpenOLAT_14.0' into OpenOLAT_14.0.uibk (6559b4ae) · 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

6559b4ae

Commit 6559b4ae authored 5 years ago by User expired

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/OpenOLAT_14.0' into OpenOLAT_14.0.uibk

parents d31545f1 a23266c3

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 2 additions, 2 deletions

pom.xml
src/main/java/org/olat/core/commons/services/video/MovieServiceImpl.java 8 additions, 7 deletions

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

src/main/java/org/olat/modules/video/VideoManager.java
src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java 80 additions, 43 deletions

...java/org/olat/modules/video/manager/VideoManagerImpl.java
src/main/java/org/olat/modules/video/manager/VideoMetadataDAO.java 2 additions, 2 deletions

...java/org/olat/modules/video/manager/VideoMetadataDAO.java
src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java 3 additions, 3 deletions

...lat/modules/video/ui/VideoAdminTranscodingController.java
src/main/java/org/olat/modules/video/ui/VideoPosterEditController.java 4 additions, 0 deletions

.../org/olat/modules/video/ui/VideoPosterEditController.java
src/main/java/org/olat/modules/video/ui/VideoPosterSelectionForm.java 1 addition, 1 deletion

...a/org/olat/modules/video/ui/VideoPosterSelectionForm.java
src/main/java/org/olat/repository/handlers/VideoHandler.java 5 additions, 12 deletions

src/main/java/org/olat/repository/handlers/VideoHandler.java
src/main/java/org/olat/upgrade/OLATUpgrade_14_0_5.java 110 additions, 0 deletions

src/main/java/org/olat/upgrade/OLATUpgrade_14_0_5.java
src/main/java/org/olat/upgrade/_spring/upgradeContext.xml 1 addition, 0 deletions

src/main/java/org/olat/upgrade/_spring/upgradeContext.xml
src/test/java/org/olat/modules/video/manager/VideoMetadataDAOTest.java 2 additions, 3 deletions

.../org/olat/modules/video/manager/VideoMetadataDAOTest.java

with 230 additions and 81 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