Merge remote-tracking branch 'origin/OpenOLAT_15.2' into OpenOLAT_15.3 (3695830b) · 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

3695830b

Commit 3695830b authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_15.2' into OpenOLAT_15.3

parents 736f15c7 82c7607a

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...a/org/olat/admin/site/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../org/olat/admin/user/imp/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/services/sms/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../commons/services/sms/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/util/pdf/PdfDocument.java 14 additions, 3 deletions

src/main/java/org/olat/core/util/pdf/PdfDocument.java
src/main/java/org/olat/course/nodes/cl/ui/CheckboxPDFExport.java 3 additions, 3 deletions

...n/java/org/olat/course/nodes/cl/ui/CheckboxPDFExport.java
src/main/java/org/olat/course/nodes/cl/ui/CheckedPDFExport.java 1 addition, 1 deletion

...in/java/org/olat/course/nodes/cl/ui/CheckedPDFExport.java
src/main/java/org/olat/login/_i18n/LocalStrings_de.properties 13 additions, 7 deletions

...main/java/org/olat/login/_i18n/LocalStrings_de.properties
src/main/java/org/olat/login/_i18n/LocalStrings_en.properties 6 additions, 0 deletions

...main/java/org/olat/login/_i18n/LocalStrings_en.properties
src/main/java/org/olat/login/_i18n/LocalStrings_fr.properties 6 additions, 0 deletions

...main/java/org/olat/login/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/login/validation/PasswordValidationRuleFactory.java 12 additions, 6 deletions

.../olat/login/validation/PasswordValidationRuleFactory.java
src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockPDFExport.java 2 additions, 2 deletions

...lat/modules/lecture/ui/export/LecturesBlockPDFExport.java
src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockSignaturePDFExport.java 2 additions, 2 deletions

...es/lecture/ui/export/LecturesBlockSignaturePDFExport.java
src/main/java/org/olat/user/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

src/main/java/org/olat/user/_i18n/LocalStrings_de.properties

with 63 additions and 28 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