Merge OpenOLAT 10.5 to OpenOLAT default branch with 4adf8fb99bdef05f89b8a67fc1d5141cd59ed645 (e6d47b39) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit e6d47b39 authored 8 years ago by srosse

Browse files

Merge OpenOLAT 10.5 to OpenOLAT default branch with 4adf8fb99bdef05f89b8a67fc1d5141cd59ed645

parents 3228e0f1 3f4b5d92

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/commons/info/notification/InfoMessageNotificationHandler.java 7 additions, 2 deletions

...ons/info/notification/InfoMessageNotificationHandler.java
src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_de.properties 2 additions, 1 deletion

...ommons/info/notification/_i18n/LocalStrings_de.properties
src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...ommons/info/notification/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java 46 additions, 20 deletions

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

...re/commons/services/notifications/model/LinkItemPart.java
src/main/java/org/olat/core/commons/services/notifications/ui/NotificationNewsController.java 2 additions, 2 deletions

...services/notifications/ui/NotificationNewsController.java
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_da.properties 1 addition, 1 deletion

...ervices/notifications/ui/_i18n/LocalStrings_da.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_de.properties 1 addition, 28 deletions

...ervices/notifications/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...ervices/notifications/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_lt.properties 1 addition, 1 deletion

...ervices/notifications/ui/_i18n/LocalStrings_lt.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_nl_NL.properties 1 addition, 1 deletion

...ices/notifications/ui/_i18n/LocalStrings_nl_NL.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_ru.properties 1 addition, 1 deletion

...ervices/notifications/ui/_i18n/LocalStrings_ru.properties
src/main/java/org/olat/core/util/mail/_content/mail_template.html 1 addition, 1 deletion

.../java/org/olat/core/util/mail/_content/mail_template.html
src/main/java/org/olat/course/nodes/info/SendMailFormatterForCourse.java 16 additions, 1 deletion

...rg/olat/course/nodes/info/SendMailFormatterForCourse.java
src/main/java/org/olat/course/nodes/info/_i18n/LocalStrings_de.properties 3 additions, 1 deletion

...g/olat/course/nodes/info/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/info/_i18n/LocalStrings_en.properties 3 additions, 12 deletions

...g/olat/course/nodes/info/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/info/_i18n/LocalStrings_fr.properties 3 additions, 12 deletions

...g/olat/course/nodes/info/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/info/_i18n/LocalStrings_it.properties 3 additions, 12 deletions

...g/olat/course/nodes/info/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/nodes/info/_i18n/LocalStrings_jp.properties 3 additions, 10 deletions

...g/olat/course/nodes/info/_i18n/LocalStrings_jp.properties
src/main/java/org/olat/course/nodes/info/_i18n/LocalStrings_nl_NL.properties 3 additions, 12 deletions

...lat/course/nodes/info/_i18n/LocalStrings_nl_NL.properties

with 99 additions and 169 deletions

Please register or to comment