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

8b987bac

Commit 8b987bac authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 0f1fc8a3 e778866a

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/sysinfo/LargeFilesController.java 80 additions, 7 deletions

...ain/java/org/olat/admin/sysinfo/LargeFilesController.java
src/main/java/org/olat/admin/sysinfo/_content/large_files.html 17 additions, 12 deletions

...ain/java/org/olat/admin/sysinfo/_content/large_files.html
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties 3 additions, 0 deletions

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties 3 additions, 0 deletions

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/services/vfs/VFSRepositoryService.java 10 additions, 0 deletions

.../olat/core/commons/services/vfs/VFSRepositoryService.java
src/main/java/org/olat/core/commons/services/vfs/manager/VFSMetadataDAO.java 9 additions, 0 deletions

...lat/core/commons/services/vfs/manager/VFSMetadataDAO.java
src/main/java/org/olat/core/commons/services/vfs/manager/VFSRepositoryServiceImpl.java 6 additions, 1 deletion

...ommons/services/vfs/manager/VFSRepositoryServiceImpl.java
src/main/java/org/olat/core/util/FileUtils.java 7 additions, 0 deletions

src/main/java/org/olat/core/util/FileUtils.java
src/main/java/org/olat/modules/lecture/manager/LectureBlockDAO.java 1 addition, 1 deletion

...ava/org/olat/modules/lecture/manager/LectureBlockDAO.java

with 136 additions and 21 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