Merge OpenOLAT default branch to OpenOLAT 13a with 929ce239def03d3ea5c092c49264d085250cf6a4 (18fbfb9b) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 18fbfb9b authored 6 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT 13a with 929ce239def03d3ea5c092c49264d085250cf6a4

parents 8acba782 780b2b4d

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/user/UserAdminController.java 41 additions, 2 deletions

src/main/java/org/olat/admin/user/UserAdminController.java
src/main/java/org/olat/admin/user/_content/udispatcher.html 4 additions, 1 deletion

src/main/java/org/olat/admin/user/_content/udispatcher.html
src/main/java/org/olat/admin/user/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

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

...java/org/olat/admin/user/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/user/delete/service/DeleteUserDataTask.java 0 additions, 39 deletions

...rg/olat/admin/user/delete/service/DeleteUserDataTask.java
src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java 1 addition, 13 deletions

...g/olat/admin/user/delete/service/UserDeletionManager.java
src/main/java/org/olat/admin/user/delete/service/UserFileDeletionManager.java 1 addition, 3 deletions

...at/admin/user/delete/service/UserFileDeletionManager.java
src/main/java/org/olat/basesecurity/BaseSecurityManager.java 1 addition, 2 deletions

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/basesecurity/GroupRoles.java 8 additions, 0 deletions

src/main/java/org/olat/basesecurity/GroupRoles.java
src/main/java/org/olat/basesecurity/manager/SecurityGroupDAO.java 1 addition, 2 deletions

.../java/org/olat/basesecurity/manager/SecurityGroupDAO.java
src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarUserDeleteManager.java 1 addition, 3 deletions

...s/calendar/manager/ICalFileCalendarUserDeleteManager.java
src/main/java/org/olat/commons/memberlist/ui/MembersAvatarDisplayRunController.java 6 additions, 6 deletions

...mons/memberlist/ui/MembersAvatarDisplayRunController.java
src/main/java/org/olat/commons/memberlist/ui/MembersListDisplayRunController.java 3 additions, 1 deletion

...ommons/memberlist/ui/MembersListDisplayRunController.java
src/main/java/org/olat/core/commons/modules/bc/BriefcaseWebDAVMergeSource.java 2 additions, 2 deletions

...t/core/commons/modules/bc/BriefcaseWebDAVMergeSource.java
src/main/java/org/olat/core/commons/modules/bc/BriefcaseWebDAVProvider.java 1 addition, 1 deletion

...olat/core/commons/modules/bc/BriefcaseWebDAVProvider.java
src/main/java/org/olat/core/commons/services/commentAndRating/manager/CommentAndRatingServiceImpl.java 1 addition, 2 deletions

...commentAndRating/manager/CommentAndRatingServiceImpl.java
src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java 62 additions, 10 deletions

...vices/notifications/manager/NotificationsManagerImpl.java
src/main/java/org/olat/core/commons/services/notifications/ui/NotificationSubscriptionController.java 7 additions, 4 deletions

.../notifications/ui/NotificationSubscriptionController.java
src/main/java/org/olat/core/commons/services/taskexecutor/manager/ExecutorJob.java 0 additions, 3 deletions

...re/commons/services/taskexecutor/manager/ExecutorJob.java
src/main/java/org/olat/core/util/coordinate/DBPersistentLockManager.java 2 additions, 6 deletions

...rg/olat/core/util/coordinate/DBPersistentLockManager.java

with 146 additions and 100 deletions

Please register or to comment