Merge remote-tracking branch 'origin/OpenOLAT_14.1' (8d50e544) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 8d50e544 authored 5 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_14.1'

parents 6e8537e5 c965a154

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/ims/qti/QTI12EditorController.java 5 additions, 0 deletions

src/main/java/org/olat/ims/qti/QTI12EditorController.java
src/main/java/org/olat/ims/qti/qpool/QTIQPoolServiceProvider.java 3 additions, 2 deletions

.../java/org/olat/ims/qti/qpool/QTIQPoolServiceProvider.java
src/main/java/org/olat/ims/qti21/pool/QTI21EditorController.java 5 additions, 0 deletions

...n/java/org/olat/ims/qti21/pool/QTI21EditorController.java
src/main/java/org/olat/ims/qti21/pool/QTI21QPoolServiceProvider.java 3 additions, 3 deletions

...va/org/olat/ims/qti21/pool/QTI21QPoolServiceProvider.java
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/qpool/QPoolItemEditorController.java 2 additions, 0 deletions

...ava/org/olat/modules/qpool/QPoolItemEditorController.java
src/main/java/org/olat/modules/qpool/QPoolSPI.java 1 addition, 1 deletion

src/main/java/org/olat/modules/qpool/QPoolSPI.java
src/main/java/org/olat/modules/qpool/impl/FileQPoolServiceProvider.java 4 additions, 5 deletions

...org/olat/modules/qpool/impl/FileQPoolServiceProvider.java
src/main/java/org/olat/modules/qpool/impl/TextQPoolServiceProvider.java 4 additions, 5 deletions

...org/olat/modules/qpool/impl/TextQPoolServiceProvider.java
src/main/java/org/olat/modules/qpool/ui/FilePreviewController.java 16 additions, 2 deletions

...java/org/olat/modules/qpool/ui/FilePreviewController.java
src/main/java/org/olat/modules/qpool/ui/QuestionItemDetailsController.java 12 additions, 3 deletions

.../olat/modules/qpool/ui/QuestionItemDetailsController.java
src/main/java/org/olat/modules/qpool/ui/TextPreviewController.java 30 additions, 22 deletions

...java/org/olat/modules/qpool/ui/TextPreviewController.java
src/main/java/org/olat/modules/qpool/ui/_content/item_details.html 10 additions, 2 deletions

...java/org/olat/modules/qpool/ui/_content/item_details.html
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

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

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

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions

...olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties
src/test/java/org/olat/commons/calendar/CalendarImportTest.java 3 additions, 5 deletions

...st/java/org/olat/commons/calendar/CalendarImportTest.java
src/test/java/org/olat/core/util/i18n/I18nTest.java 6 additions, 117 deletions

src/test/java/org/olat/core/util/i18n/I18nTest.java
src/test/java/org/olat/core/util/mail/manager/MailManagerTest.java 1 addition, 89 deletions

...java/org/olat/core/util/mail/manager/MailManagerTest.java

with 110 additions and 257 deletions

Please register or to comment