Merge remote-tracking branch 'origin/OpenOLAT_15.1' (d1c7face) · 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

d1c7face

Commit d1c7face authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_15.1'

parents ca0b684e f7f49c1e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/VideoCourseNode.java 32 additions, 7 deletions

src/main/java/org/olat/course/nodes/VideoCourseNode.java
src/main/java/org/olat/course/nodes/video/VideoEditController.java 5 additions, 25 deletions

...java/org/olat/course/nodes/video/VideoEditController.java
src/main/java/org/olat/course/nodes/video/VideoRunController.java 1 addition, 19 deletions

.../java/org/olat/course/nodes/video/VideoRunController.java
src/main/java/org/olat/modules/video/ui/VideoDisplayController.java 3 additions, 16 deletions

...ava/org/olat/modules/video/ui/VideoDisplayController.java
src/main/java/org/olat/modules/video/ui/VideoDisplayOptions.java 1 addition, 12 deletions

...n/java/org/olat/modules/video/ui/VideoDisplayOptions.java
src/main/java/org/olat/modules/video/ui/VideoListingController.java 1 addition, 1 deletion

...ava/org/olat/modules/video/ui/VideoListingController.java

with 43 additions and 80 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