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

Commit 5406cf9e authored 4 years ago by Andreas Parschalk

Browse files

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

parents 8b022054 cec25e1b

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/bps/course/nodes/ll/LLEditForm.java 2 additions, 1 deletion

src/main/java/de/bps/course/nodes/ll/LLEditForm.java
src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java 4 additions, 0 deletions

...olat/core/gui/components/form/flexible/FormUIFactory.java
src/main/java/org/olat/core/util/i18n/ui/TranslationToolI18nItemEditCrumbController.java 13 additions, 46 deletions

...l/i18n/ui/TranslationToolI18nItemEditCrumbController.java
src/main/java/org/olat/core/util/i18n/ui/TranslationToolStartCrumbController.java 4 additions, 4 deletions

...ore/util/i18n/ui/TranslationToolStartCrumbController.java
src/main/java/org/olat/core/util/mail/ui/SendDocumentsByEMailController.java 3 additions, 1 deletion

...lat/core/util/mail/ui/SendDocumentsByEMailController.java
src/main/java/org/olat/course/disclaimer/ui/CourseDisclaimerController.java 2 additions, 2 deletions

...olat/course/disclaimer/ui/CourseDisclaimerController.java
src/main/java/org/olat/course/editor/MultiSPController.java 2 additions, 1 deletion

src/main/java/org/olat/course/editor/MultiSPController.java
src/main/java/org/olat/ims/qti21/resultexport/QTI21ResultsExportMediaResource.java 1 addition, 1 deletion

...s/qti21/resultexport/QTI21ResultsExportMediaResource.java
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 2 additions, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties 2 additions, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_it.properties 0 additions, 1 deletion

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_it.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_pt_BR.properties 0 additions, 1 deletion

...t/ims/qti21/ui/editor/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_zh_CN.properties 0 additions, 1 deletion

...t/ims/qti21/ui/editor/_i18n/LocalStrings_zh_CN.properties
src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBNumericalEntrySettingsController.java 2 additions, 2 deletions

...tor/interactions/FIBNumericalEntrySettingsController.java
src/main/java/org/olat/modules/opencast/OpencastEventProvider.java 15 additions, 1 deletion

...java/org/olat/modules/opencast/OpencastEventProvider.java
src/main/java/org/olat/modules/opencast/OpencastSeriesProvider.java 15 additions, 1 deletion

...ava/org/olat/modules/opencast/OpencastSeriesProvider.java

with 72 additions and 66 deletions

Please register or to comment