Merge remote-tracking branch 'origin/OpenOLAT_13.2' (e145046e) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

e145046e

Commit e145046e authored 5 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_13.2'

parents 31bc9234 a1507cc4

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/gui/render/StringOutput.java 119 additions, 100 deletions

src/main/java/org/olat/core/gui/render/StringOutput.java
src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java 63 additions, 3 deletions

...urse/certificate/manager/CertificatePdfServiceWorker.java
src/main/java/org/olat/course/config/ui/CourseOptionsController.java 2 additions, 1 deletion

...va/org/olat/course/config/ui/CourseOptionsController.java
src/main/java/org/olat/course/config/ui/_i18n/LocalStrings_de.properties 2 additions, 1 deletion

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

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

...rg/olat/course/config/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/run/CourseRuntimeController.java 1 addition, 1 deletion

...ain/java/org/olat/course/run/CourseRuntimeController.java

with 189 additions and 106 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment