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

d027bcac

Commit d027bcac authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 56407616 bbe6d3a3

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 6 additions, 1 deletion

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

...rg/olat/core/commons/services/video/MovieServiceImpl.java
src/main/java/org/olat/group/manager/BusinessGroupDAO.java 4 additions, 3 deletions

src/main/java/org/olat/group/manager/BusinessGroupDAO.java
src/main/java/org/olat/group/ui/main/BusinessGroupListFlexiTableModel.java 1 addition, 1 deletion

.../olat/group/ui/main/BusinessGroupListFlexiTableModel.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentRenderFunctions.java 1 addition, 1 deletion

...at/ims/qti21/ui/components/AssessmentRenderFunctions.java
src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java 9 additions, 16 deletions

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

with 46 additions and 45 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