Merge OpenOLAT default branch to OpenOLAT 10 with ca2d848ad0b7531340f619576b657bb2d2dbf2ff (27784568) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 27784568 authored 10 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT 10 with ca2d848ad0b7531340f619576b657bb2d2dbf2ff

parents 556d681b 99be5272

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfo.java 5 additions, 0 deletions

.../java/org/olat/core/commons/modules/bc/meta/MetaInfo.java
src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfoFileImpl.java 10 additions, 2 deletions

...g/olat/core/commons/modules/bc/meta/MetaInfoFileImpl.java
src/main/java/org/olat/core/commons/services/webdav/manager/VFSResourceRoot.java 2 additions, 3 deletions

...core/commons/services/webdav/manager/VFSResourceRoot.java
src/main/java/org/olat/core/servlets/OpenOLATServlet.java 8 additions, 1 deletion

src/main/java/org/olat/core/servlets/OpenOLATServlet.java
src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java 7 additions, 0 deletions

...java/org/olat/core/util/mail/manager/MailManagerImpl.java
src/main/java/org/olat/core/util/vfs/lock/LockInfo.java 1 addition, 1 deletion

src/main/java/org/olat/core/util/vfs/lock/LockInfo.java
src/main/java/org/olat/course/CoursefolderWebDAVMergeSource.java 12 additions, 29 deletions

...n/java/org/olat/course/CoursefolderWebDAVMergeSource.java
src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_fr.properties 42 additions, 1 deletion

.../olat/course/nodes/cl/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/ta/DropboxController.java 5 additions, 5 deletions

...main/java/org/olat/course/nodes/ta/DropboxController.java
src/main/java/org/olat/course/nodes/ta/DropboxFileUploadNotificationHandler.java 3 additions, 3 deletions

...course/nodes/ta/DropboxFileUploadNotificationHandler.java
src/main/java/org/olat/course/nodes/ta/SolutionController.java 7 additions, 9 deletions

...ain/java/org/olat/course/nodes/ta/SolutionController.java
src/main/java/org/olat/course/nodes/ta/SolutionFileUploadNotificationHandler.java 3 additions, 3 deletions

...ourse/nodes/ta/SolutionFileUploadNotificationHandler.java
src/main/java/org/olat/course/nodes/ta/TACourseNodeEditController.java 7 additions, 10 deletions

.../org/olat/course/nodes/ta/TACourseNodeEditController.java
src/main/java/org/olat/course/nodes/ta/TACourseNodeRunController.java 1 addition, 1 deletion

...a/org/olat/course/nodes/ta/TACourseNodeRunController.java
src/main/java/org/olat/group/GroupfoldersWebDAVMergeSource.java 12 additions, 39 deletions

...in/java/org/olat/group/GroupfoldersWebDAVMergeSource.java
src/main/java/org/olat/ims/qti/statistics/ui/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...at/ims/qti/statistics/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/sharedfolder/SharedFolderWebDAVMergeSource.java 10 additions, 72 deletions

...t/modules/sharedfolder/SharedFolderWebDAVMergeSource.java
src/main/java/org/olat/registration/RegistrationController.java 6 additions, 1 deletion

...in/java/org/olat/registration/RegistrationController.java
src/test/java/org/olat/core/commons/services/webdav/WebDAVCommandsTest.java 27 additions, 0 deletions

...olat/core/commons/services/webdav/WebDAVCommandsTest.java
src/test/java/org/olat/core/commons/services/webdav/WebDAVConnection.java 8 additions, 0 deletions

...g/olat/core/commons/services/webdav/WebDAVConnection.java

with 178 additions and 180 deletions

Please register or to comment