Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 (9e2dd9d3) · 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

9e2dd9d3

Commit 9e2dd9d3 authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0

parents 15a9061a 65d5e43c

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/user/imp/ImportStep00.java 43 additions, 18 deletions

src/main/java/org/olat/admin/user/imp/ImportStep00.java
src/main/java/org/olat/core/util/vfs/VFSManager.java 6 additions, 2 deletions

src/main/java/org/olat/core/util/vfs/VFSManager.java
src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonRunController.java 5 additions, 3 deletions

.../modules/bigbluebutton/ui/BigBlueButtonRunController.java
src/main/java/org/olat/modules/video/VideoManager.java 3 additions, 2 deletions

src/main/java/org/olat/modules/video/VideoManager.java
src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java 28 additions, 7 deletions

...java/org/olat/modules/video/manager/VideoManagerImpl.java
src/main/java/org/olat/repository/handlers/VideoHandler.java 2 additions, 2 deletions

src/main/java/org/olat/repository/handlers/VideoHandler.java
src/main/java/org/olat/upgrade/OLATUpgrade_14_2_10.java 144 additions, 0 deletions

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

src/main/java/org/olat/upgrade/_spring/upgradeContext.xml

with 232 additions and 34 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