Merge OpenOLAT default branch to OpenOLAT qti with f83a3a660649311a233cb89f085eb8f4a1cda8f4 (88d005f5) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 88d005f5 authored 9 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT qti with f83a3a660649311a233cb89f085eb8f4a1cda8f4

parents 55de3df6 b3776041

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 1 addition, 0 deletions

.hgtags
src/main/java/org/olat/admin/user/delete/ReadyToDeleteController.java 1 addition, 2 deletions

...a/org/olat/admin/user/delete/ReadyToDeleteController.java
src/main/java/org/olat/admin/user/delete/SelectionController.java 2 additions, 2 deletions

.../java/org/olat/admin/user/delete/SelectionController.java
src/main/java/org/olat/admin/user/delete/_content/deletestatus.html 2 additions, 6 deletions

...ava/org/olat/admin/user/delete/_content/deletestatus.html
src/main/java/org/olat/admin/user/delete/_content/readyToDelete.html 2 additions, 6 deletions

...va/org/olat/admin/user/delete/_content/readyToDelete.html
src/main/java/org/olat/admin/user/delete/_content/selectionuserlist.html 3 additions, 9 deletions

...rg/olat/admin/user/delete/_content/selectionuserlist.html
src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...g/olat/admin/user/delete/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java 1 addition, 1 deletion

...g/olat/admin/user/delete/service/UserDeletionManager.java
src/main/java/org/olat/basesecurity/BaseSecurity.java 1 addition, 1 deletion

src/main/java/org/olat/basesecurity/BaseSecurity.java
src/main/java/org/olat/basesecurity/BaseSecurityManager.java 2 additions, 1 deletion

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/commons/calendar/ICalServlet.java 16 additions, 11 deletions

src/main/java/org/olat/commons/calendar/ICalServlet.java
src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java 2 additions, 0 deletions

...lat/core/commons/fullWebApp/BaseFullWebappController.java
src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html 1 addition, 1 deletion

...at/core/commons/fullWebApp/_content/fullwebapplayout.html
src/main/java/org/olat/core/commons/services/notifications/NotificationsManager.java 17 additions, 0 deletions

.../commons/services/notifications/NotificationsManager.java
src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java 60 additions, 12 deletions

...vices/notifications/manager/NotificationsManagerImpl.java
src/main/java/org/olat/core/commons/services/notifications/model/SubscriberImpl.java 7 additions, 0 deletions

.../commons/services/notifications/model/SubscriberImpl.java
src/main/java/org/olat/core/commons/services/notifications/restapi/NotificationsWebService.java 88 additions, 0 deletions

...rvices/notifications/restapi/NotificationsWebService.java
src/main/java/org/olat/core/commons/services/notifications/restapi/vo/PublisherVO.java 113 additions, 0 deletions

...ommons/services/notifications/restapi/vo/PublisherVO.java
src/main/java/org/olat/core/commons/services/notifications/restapi/vo/SubscriberVO.java 63 additions, 0 deletions

...mmons/services/notifications/restapi/vo/SubscriberVO.java
src/main/java/org/olat/core/commons/services/webdav/WebDAVModule.java 16 additions, 0 deletions

...a/org/olat/core/commons/services/webdav/WebDAVModule.java

with 399 additions and 53 deletions

Please register or to comment