Merge OpenOLAT 10.5 to OpenOLAT default branch with e115818563d609bf21849d8f5ed87879fb02e1b1 (01c26c4c) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 01c26c4c authored 8 years ago by srosse

Browse files

Merge OpenOLAT 10.5 to OpenOLAT default branch with e115818563d609bf21849d8f5ed87879fb02e1b1

parents ab826b24 2444c1d9

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 1 addition, 0 deletions

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

src/main/java/org/olat/admin/user/UserAdminController.java
src/main/java/org/olat/core/commons/services/notifications/NotificationUIFactory.java 0 additions, 14 deletions

...commons/services/notifications/NotificationUIFactory.java
src/main/java/org/olat/core/commons/services/notifications/ui/NotificationSubscriptionAndNewsController.java 1 addition, 1 deletion

...cations/ui/NotificationSubscriptionAndNewsController.java
src/main/java/org/olat/core/commons/services/notifications/ui/NotificationSubscriptionController.java 4 additions, 2 deletions

.../notifications/ui/NotificationSubscriptionController.java
src/main/java/org/olat/core/commons/services/notifications/ui/NotificationSubscriptionTableDataModel.java 13 additions, 7 deletions

...ifications/ui/NotificationSubscriptionTableDataModel.java
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_de.properties 3 additions, 0 deletions

...ervices/notifications/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_en.properties 3 additions, 0 deletions

...ervices/notifications/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...at/course/certificate/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/export/CourseEnvironmentMapper.java 21 additions, 0 deletions

.../java/org/olat/course/export/CourseEnvironmentMapper.java
src/main/java/org/olat/course/nodes/CheckListCourseNode.java 54 additions, 3 deletions

src/main/java/org/olat/course/nodes/CheckListCourseNode.java
src/main/java/org/olat/course/nodes/TitledWrapperHelper.java 4 additions, 4 deletions

src/main/java/org/olat/course/nodes/TitledWrapperHelper.java
src/main/java/org/olat/course/nodes/cl/CheckboxManager.java 2 additions, 3 deletions

src/main/java/org/olat/course/nodes/cl/CheckboxManager.java
src/main/java/org/olat/course/nodes/cl/manager/CheckboxManagerImpl.java 2 additions, 2 deletions

...org/olat/course/nodes/cl/manager/CheckboxManagerImpl.java
src/main/java/org/olat/course/nodes/cl/ui/CheckListBoxListEditController.java 1 addition, 1 deletion

...at/course/nodes/cl/ui/CheckListBoxListEditController.java
src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java 1 addition, 1 deletion

...a/org/olat/course/nodes/cl/ui/CheckListRunController.java
src/main/java/org/olat/course/nodes/cl/ui/CheckboxEditController.java 1 addition, 1 deletion

...a/org/olat/course/nodes/cl/ui/CheckboxEditController.java
src/main/java/org/olat/course/nodes/cl/ui/wizard/CheckListStepRunnerCallback.java 1 addition, 1 deletion

...ourse/nodes/cl/ui/wizard/CheckListStepRunnerCallback.java
src/main/java/org/olat/course/run/_content/index.html 3 additions, 1 deletion

src/main/java/org/olat/course/run/_content/index.html
src/main/java/org/olat/modules/portfolio/ui/BinderMetadataEditController.java 0 additions, 1 deletion

...at/modules/portfolio/ui/BinderMetadataEditController.java

with 119 additions and 46 deletions

Please register or to comment