Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk (67a7d18d) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 67a7d18d authored 5 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk

parents 9339d23a a7283276

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 1 addition, 1 deletion

pom.xml
src/main/java/org/olat/_spring/mainContext.xml 1 addition, 1 deletion

src/main/java/org/olat/_spring/mainContext.xml
src/main/java/org/olat/admin/sysinfo/LargeFilesController.java 10 additions, 5 deletions

...ain/java/org/olat/admin/sysinfo/LargeFilesController.java
src/main/java/org/olat/admin/sysinfo/_content/large_files_path_info.html 7 additions, 0 deletions

...rg/olat/admin/sysinfo/_content/large_files_path_info.html
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties 4 additions, 0 deletions

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

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/sysinfo/model/LargeFilesTableContentRow.java 18 additions, 2 deletions

...g/olat/admin/sysinfo/model/LargeFilesTableContentRow.java
src/main/java/org/olat/admin/sysinfo/model/LargeFilesTableModel.java 2 additions, 0 deletions

...va/org/olat/admin/sysinfo/model/LargeFilesTableModel.java
src/main/java/org/olat/collaboration/CollaborationToolsFolderVFSContextInfoResolver.java 114 additions, 0 deletions

...ation/CollaborationToolsFolderVFSContextInfoResolver.java
src/main/java/org/olat/collaboration/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...a/org/olat/collaboration/_i18n/LocalStrings_de.properties
src/main/java/org/olat/collaboration/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...a/org/olat/collaboration/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/fullWebApp/_content/main_3cols.html 2 additions, 2 deletions

...org/olat/core/commons/fullWebApp/_content/main_3cols.html
src/main/java/org/olat/core/commons/services/vfs/VFSContextInfo.java 54 additions, 0 deletions

...va/org/olat/core/commons/services/vfs/VFSContextInfo.java
src/main/java/org/olat/core/commons/services/vfs/VFSContextInfoResolver.java 55 additions, 0 deletions

...lat/core/commons/services/vfs/VFSContextInfoResolver.java
src/main/java/org/olat/core/commons/services/vfs/VFSRepositoryService.java 24 additions, 0 deletions

.../olat/core/commons/services/vfs/VFSRepositoryService.java
src/main/java/org/olat/core/commons/services/vfs/impl/VFSContextInfoImpl.java 56 additions, 0 deletions

...at/core/commons/services/vfs/impl/VFSContextInfoImpl.java
src/main/java/org/olat/core/commons/services/vfs/impl/VFSContextInfoUnknown.java 34 additions, 0 deletions

...core/commons/services/vfs/impl/VFSContextInfoUnknown.java
src/main/java/org/olat/core/commons/services/vfs/impl/VFSContextInfoUnknownPathResolver.java 55 additions, 0 deletions

.../services/vfs/impl/VFSContextInfoUnknownPathResolver.java
src/main/java/org/olat/core/commons/services/vfs/manager/VFSRepositoryServiceImpl.java 46 additions, 0 deletions

...ommons/services/vfs/manager/VFSRepositoryServiceImpl.java
src/main/java/org/olat/course/CourseVFSContextInfoResolver.java 116 additions, 0 deletions

...in/java/org/olat/course/CourseVFSContextInfoResolver.java

with 608 additions and 11 deletions

Please register or to comment