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

12152525

Commit 12152525 authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents a57a6273 a94f7448

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/services/vfs/manager/VFSMetadataDAO.java 10 additions, 2 deletions

...lat/core/commons/services/vfs/manager/VFSMetadataDAO.java
src/main/java/org/olat/core/commons/services/vfs/manager/VFSRepositoryServiceImpl.java 26 additions, 7 deletions

...ommons/services/vfs/manager/VFSRepositoryServiceImpl.java
src/main/java/org/olat/core/commons/services/vfs/model/VFSMetadataFileSaved.java 10 additions, 0 deletions

...core/commons/services/vfs/model/VFSMetadataFileSaved.java
src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java 6 additions, 9 deletions

.../java/org/olat/modules/webFeed/ui/FeedFormController.java
src/main/java/org/olat/modules/webFeed/ui/ItemFormController.java 1 addition, 0 deletions

.../java/org/olat/modules/webFeed/ui/ItemFormController.java
src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

.../olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

.../olat/modules/webFeed/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_fr.properties 2 additions, 0 deletions

.../olat/modules/webFeed/ui/_i18n/LocalStrings_fr.properties
src/main/resources/database/mysql/refreshViews.sql 1 addition, 1 deletion

src/main/resources/database/mysql/refreshViews.sql
src/main/webapp/static/movie/player.js 44 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 105 additions and 24 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