Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (d62fa9cd) · 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

d62fa9cd

Commit d62fa9cd authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents cab30e8e 51df8e25

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamVideoController.java 32 additions, 9 deletions

...course/nodes/livestream/ui/LiveStreamVideoController.java
src/main/java/org/olat/course/nodes/livestream/ui/_content/video.html 11 additions, 3 deletions

...a/org/olat/course/nodes/livestream/ui/_content/video.html
src/main/java/org/olat/course/nodes/livestream/ui/_content/viewer.html 1 addition, 1 deletion

.../org/olat/course/nodes/livestream/ui/_content/viewer.html
src/main/java/org/olat/course/nodes/livestream/ui/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

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

...urse/nodes/livestream/ui/_i18n/LocalStrings_en.properties
src/main/webapp/static/movie/player.js 10 additions, 4 deletions

src/main/webapp/static/movie/player.js
src/main/webapp/static/movie/player.min.js 1 addition, 1 deletion

src/main/webapp/static/movie/player.min.js

with 59 additions and 18 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