Merge remote-tracking branch 'upstream/OpenOLAT_12.5' (588a7493) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 588a7493 authored 6 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_12.5'

parents bc547bce 4f2efc20

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

NOTICE.TXT 3 additions, 3 deletions

NOTICE.TXT
src/main/java/org/olat/admin/privacy/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

...a/org/olat/admin/privacy/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/quota/GenericQuotaEditController.java 1 addition, 0 deletions

...java/org/olat/admin/quota/GenericQuotaEditController.java
src/main/java/org/olat/admin/quota/QuotaConstants.java 1 addition, 0 deletions

src/main/java/org/olat/admin/quota/QuotaConstants.java
src/main/java/org/olat/admin/quota/QuotaManagerImpl.java 2 additions, 0 deletions

src/main/java/org/olat/admin/quota/QuotaManagerImpl.java
src/main/java/org/olat/admin/quota/_content/edit.html 5 additions, 0 deletions

src/main/java/org/olat/admin/quota/_content/edit.html
src/main/java/org/olat/admin/quota/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...ava/org/olat/admin/quota/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/quota/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...ava/org/olat/admin/quota/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/modules/bc/FolderMapper.java 50 additions, 0 deletions

...n/java/org/olat/core/commons/modules/bc/FolderMapper.java
src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java 3 additions, 4 deletions

...org/olat/core/commons/modules/bc/FolderRunController.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeResource.java 18 additions, 15 deletions

...at/core/commons/modules/bc/commands/CmdServeResource.java
src/main/java/org/olat/core/commons/modules/bc/commands/CmdUpload.java 1 addition, 1 deletion

.../org/olat/core/commons/modules/bc/commands/CmdUpload.java
src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml 10 additions, 0 deletions

...va/org/olat/core/dispatcher/_spring/dispatcherContext.xml
src/main/java/org/olat/core/gui/control/navigation/AbstractSiteInstance.java 13 additions, 1 deletion

...lat/core/gui/control/navigation/AbstractSiteInstance.java
src/main/java/org/olat/course/editor/MultiSPController.java 11 additions, 4 deletions

src/main/java/org/olat/course/editor/MultiSPController.java
src/main/java/org/olat/course/folder/MergedPFCourseNodeContainer.java 1 addition, 0 deletions

...a/org/olat/course/folder/MergedPFCourseNodeContainer.java
src/main/java/org/olat/course/nodes/pf/manager/PFManager.java 16 additions, 11 deletions

...main/java/org/olat/course/nodes/pf/manager/PFManager.java
src/main/java/org/olat/course/nodes/pf/manager/ReadWriteCallback.java 19 additions, 4 deletions

...a/org/olat/course/nodes/pf/manager/ReadWriteCallback.java
src/main/java/org/olat/course/nodes/pf/manager/ReadWriteDeleteCallback.java 3 additions, 49 deletions

...olat/course/nodes/pf/manager/ReadWriteDeleteCallback.java
src/main/java/org/olat/group/ui/_i18n/LocalStrings_de.properties 4 additions, 4 deletions

...n/java/org/olat/group/ui/_i18n/LocalStrings_de.properties

with 166 additions and 99 deletions

Please register or to comment