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

968244d5

Commit 968244d5 authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 5a9db568 431a84ad

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/services/commentAndRating/manager/UserCommentsDAO.java 17 additions, 10 deletions

...ns/services/commentAndRating/manager/UserCommentsDAO.java
src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDisplayController.java 5 additions, 9 deletions

...e/gui/control/generic/iframe/IFrameDisplayController.java
src/main/java/org/olat/course/nodes/video/VideoEditController.java 8 additions, 10 deletions

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

.../java/org/olat/course/nodes/video/VideoRunController.java
src/main/java/org/olat/modules/lecture/ui/coach/AbsenceNoticesListController.java 16 additions, 14 deletions

...odules/lecture/ui/coach/AbsenceNoticesListController.java
src/main/java/org/olat/modules/video/ui/VideoDisplayController.java 9 additions, 5 deletions

...ava/org/olat/modules/video/ui/VideoDisplayController.java
src/main/java/org/olat/modules/video/ui/VideoDisplayOptions.java 19 additions, 8 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
src/main/java/org/olat/modules/video/ui/_content/video_run.html 3 additions, 5 deletions

...in/java/org/olat/modules/video/ui/_content/video_run.html

with 83 additions and 67 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