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

Commit c9f4b1ad authored 4 years ago by Andreas Parschalk

Browse files

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

parents 3e3294e7 58e66cf7

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/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

src/main/java/org/olat/core/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

src/main/java/org/olat/core/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

src/main/java/org/olat/core/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/disclaimer/CourseDisclaimerManager.java 3 additions, 2 deletions

...a/org/olat/course/disclaimer/CourseDisclaimerManager.java
src/main/java/org/olat/course/disclaimer/manager/CourseDisclaimerManagerImpl.java 5 additions, 4 deletions

...ourse/disclaimer/manager/CourseDisclaimerManagerImpl.java
src/main/java/org/olat/course/disclaimer/ui/CourseDisclaimerConsentController.java 1 addition, 1 deletion

...urse/disclaimer/ui/CourseDisclaimerConsentController.java
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

...olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_it.properties 1 addition, 0 deletions

...olat/course/nodes/gta/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_pl.properties 2 additions, 1 deletion

...olat/course/nodes/gta/ui/_i18n/LocalStrings_pl.properties
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions

...t/course/nodes/gta/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/opencast/ui/_i18n/LocalStrings_de.properties 3 additions, 3 deletions

...course/nodes/opencast/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/opencast/ui/_i18n/LocalStrings_en.properties 3 additions, 3 deletions

...course/nodes/opencast/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/opencast/ui/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...course/nodes/opencast/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/pf/ui/PFCoachController.java 3 additions, 3 deletions

...n/java/org/olat/course/nodes/pf/ui/PFCoachController.java
src/main/java/org/olat/course/nodes/pf/ui/PFFileUploadController.java 11 additions, 14 deletions

...a/org/olat/course/nodes/pf/ui/PFFileUploadController.java
src/main/java/org/olat/course/nodes/pf/ui/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

.../olat/course/nodes/pf/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/run/RunMainController.java 1 addition, 1 deletion

src/main/java/org/olat/course/run/RunMainController.java
src/main/java/org/olat/course/run/navigation/NavigationHandler.java 14 additions, 6 deletions

...ava/org/olat/course/run/navigation/NavigationHandler.java

with 57 additions and 44 deletions

Please register or to comment