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

Commit 6c9af5a2 authored 5 years ago by uhensler

Browse files

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

parents 4c9ab3e7 360d6a64

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

...olat/commons/calendar/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...in/java/org/olat/core/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java 8 additions, 1 deletion

...ourse/assessment/manager/CourseAssessmentManagerImpl.java
src/main/java/org/olat/course/assessment/ui/tool/IdentityCertificatesController.java 8 additions, 1 deletion

...se/assessment/ui/tool/IdentityCertificatesController.java
src/main/java/org/olat/course/certificate/CertificatesManager.java 4 additions, 3 deletions

...java/org/olat/course/certificate/CertificatesManager.java
src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java 15 additions, 6 deletions

.../course/certificate/manager/CertificatePDFFormWorker.java
src/main/java/org/olat/course/certificate/manager/CertificatePdfServiceWorker.java 16 additions, 7 deletions

...urse/certificate/manager/CertificatePdfServiceWorker.java
src/main/java/org/olat/course/certificate/manager/CertificatePhantomWorker.java 16 additions, 7 deletions

.../course/certificate/manager/CertificatePhantomWorker.java
src/main/java/org/olat/course/certificate/manager/CertificatesManagerImpl.java 42 additions, 24 deletions

...t/course/certificate/manager/CertificatesManagerImpl.java
src/main/java/org/olat/course/certificate/model/CertificateConfig.java 100 additions, 0 deletions

.../org/olat/course/certificate/model/CertificateConfig.java
src/main/java/org/olat/course/certificate/model/JmsCertificateWork.java 7 additions, 7 deletions

...org/olat/course/certificate/model/JmsCertificateWork.java
src/main/java/org/olat/course/certificate/restapi/CertificationWebService.java 27 additions, 20 deletions

...t/course/certificate/restapi/CertificationWebService.java
src/main/java/org/olat/course/certificate/ui/AssessedIdentityCertificatesController.java 8 additions, 1 deletion

...ertificate/ui/AssessedIdentityCertificatesController.java
src/main/java/org/olat/course/certificate/ui/CertificatesOptionsController.java 16 additions, 1 deletion

.../course/certificate/ui/CertificatesOptionsController.java
src/main/java/org/olat/course/certificate/ui/CertificatesSelectionController.java 1 addition, 1 deletion

...ourse/certificate/ui/CertificatesSelectionController.java
src/main/java/org/olat/course/certificate/ui/CertificatesSelectionOverviewController.java 1 addition, 1 deletion

...rtificate/ui/CertificatesSelectionOverviewController.java
src/main/java/org/olat/course/certificate/ui/UploadCertificateController.java 1 addition, 1 deletion

...at/course/certificate/ui/UploadCertificateController.java
src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_de.properties 4 additions, 1 deletion

...at/course/certificate/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_en.properties 4 additions, 1 deletion

...at/course/certificate/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_fr.properties 0 additions, 1 deletion

...at/course/certificate/ui/_i18n/LocalStrings_fr.properties

with 281 additions and 86 deletions

Please register or to comment