Merge with 2ec7e30d6ca92f689113cac6f7c84974da1e135d (22830824) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 22830824 authored 7 years ago by uhensler

Browse files

Merge with 2ec7e30d6ca92f689113cac6f7c84974da1e135d

parents ed86c26d 890b791b

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/services/notifications/NotificationHelper.java 5 additions, 8 deletions

...re/commons/services/notifications/NotificationHelper.java
src/main/java/org/olat/core/commons/services/notifications/NotificationsManager.java 2 additions, 0 deletions

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

...vices/notifications/manager/NotificationsManagerImpl.java
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...ervices/notifications/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/util/FileUtils.java 1 addition, 1 deletion

src/main/java/org/olat/core/util/FileUtils.java
src/main/java/org/olat/core/util/i18n/ui/_content/translationToolI18nItemEdit.html 1 addition, 1 deletion

...re/util/i18n/ui/_content/translationToolI18nItemEdit.html
src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_fr.properties 4 additions, 2 deletions

.../org/olat/core/util/mail/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/archiver/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...org/olat/course/archiver/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/assessment/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...g/olat/course/assessment/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/_i18n/LocalStrings_fr.properties 7 additions, 1 deletion

...g/olat/course/assessment/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/assessment/bulk/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...t/course/assessment/bulk/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/ui/mode/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...ourse/assessment/ui/mode/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseController.java 11 additions, 5 deletions

...ssessment/ui/tool/AssessmentIdentityCourseController.java
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...ourse/assessment/ui/tool/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_fr.properties 4 additions, 1 deletion

...ourse/assessment/ui/tool/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/IQTESTCourseNode.java 2 additions, 1 deletion

src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
src/main/java/org/olat/course/nodes/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...va/org/olat/course/nodes/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/basiclti/LTIConfigForm.java 22 additions, 1 deletion

...in/java/org/olat/course/nodes/basiclti/LTIConfigForm.java
src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_de.properties 3 additions, 1 deletion

...at/course/nodes/basiclti/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_en.properties 3 additions, 1 deletion

...at/course/nodes/basiclti/_i18n/LocalStrings_en.properties

with 158 additions and 38 deletions

Please register or to comment