Merge with 18cbf898bfbd9f8bf14a75a6becc0b18204f70c8 (2444c1d9) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 2444c1d9 authored 8 years ago by gnaegi

Browse files

Merge with 18cbf898bfbd9f8bf14a75a6becc0b18204f70c8

parents ec34f0d9 f410279e

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/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

with 118 additions and 45 deletions

Please register or to comment