Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk (172f4c63) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 172f4c63 authored 5 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_14.2' into OpenOLAT_14.2.uibk

parents bd747d59 03050d68

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/sysinfo/SysinfoController.java 15 additions, 8 deletions

src/main/java/org/olat/admin/sysinfo/SysinfoController.java
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/sysinfo/manager/SessionStatsManager.java 14 additions, 1 deletion

...a/org/olat/admin/sysinfo/manager/SessionStatsManager.java
src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java 6 additions, 4 deletions

...ntrollers/filechooser/LinkFileCombiCalloutController.java
src/main/java/org/olat/core/commons/modules/bc/notifications/FolderNotificationsHandler.java 2 additions, 1 deletion

.../modules/bc/notifications/FolderNotificationsHandler.java
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_cs.properties 3 additions, 3 deletions

...ervices/notifications/ui/_i18n/LocalStrings_cs.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_da.properties 3 additions, 3 deletions

...ervices/notifications/ui/_i18n/LocalStrings_da.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_de.properties 15 additions, 15 deletions

...ervices/notifications/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_el.properties 4 additions, 4 deletions

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

...ervices/notifications/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_es.properties 4 additions, 4 deletions

...ervices/notifications/ui/_i18n/LocalStrings_es.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_fr.properties 4 additions, 4 deletions

...ervices/notifications/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_it.properties 3 additions, 3 deletions

...ervices/notifications/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_lt.properties 3 additions, 3 deletions

...ervices/notifications/ui/_i18n/LocalStrings_lt.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_nl_NL.properties 3 additions, 3 deletions

...ices/notifications/ui/_i18n/LocalStrings_nl_NL.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_pl.properties 4 additions, 4 deletions

...ervices/notifications/ui/_i18n/LocalStrings_pl.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_pt_BR.properties 4 additions, 4 deletions

...ices/notifications/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_pt_PT.properties 4 additions, 4 deletions

...ices/notifications/ui/_i18n/LocalStrings_pt_PT.properties
src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_ru.properties 3 additions, 3 deletions

...ervices/notifications/ui/_i18n/LocalStrings_ru.properties

with 99 additions and 75 deletions

Please register or to comment