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

Commit 6d9cd33e authored 4 years ago by User expired

Browse files

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

parents 2be5681c 536d3186

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/core/gui/components/form/flexible/elements/AutoCompleter.java 2 additions, 0 deletions

.../gui/components/form/flexible/elements/AutoCompleter.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/AutoCompleterImpl.java 1 addition, 0 deletions

...onents/form/flexible/impl/elements/AutoCompleterImpl.java
src/main/java/org/olat/course/nodes/opencast/ui/OpencastConfigController.java 62 additions, 4 deletions

...at/course/nodes/opencast/ui/OpencastConfigController.java
src/main/java/org/olat/course/nodes/opencast/ui/_content/event_search.html 4 additions, 0 deletions

.../olat/course/nodes/opencast/ui/_content/event_search.html
src/main/java/org/olat/course/nodes/opencast/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

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

...course/nodes/opencast/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties 3 additions, 0 deletions

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

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

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_it.properties 3 additions, 0 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_pt_BR.properties 3 additions, 0 deletions

...org/olat/ims/qti21/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/ims/qti21/ui/components/_content/matchInteraction_truefalse.html 10 additions, 3 deletions

...21/ui/components/_content/matchInteraction_truefalse.html
src/main/java/org/olat/modules/lecture/manager/LectureBlockRollCallDAO.java 32 additions, 3 deletions

...olat/modules/lecture/manager/LectureBlockRollCallDAO.java
src/main/java/org/olat/modules/opencast/OpencastEvent.java 4 additions, 0 deletions

src/main/java/org/olat/modules/opencast/OpencastEvent.java
src/main/java/org/olat/modules/opencast/manager/OpencastServiceImpl.java 2 additions, 0 deletions

...rg/olat/modules/opencast/manager/OpencastServiceImpl.java
src/main/java/org/olat/modules/opencast/manager/client/Event.java 18 additions, 0 deletions

.../java/org/olat/modules/opencast/manager/client/Event.java
src/main/java/org/olat/modules/opencast/model/OpencastEventImpl.java 20 additions, 0 deletions

...va/org/olat/modules/opencast/model/OpencastEventImpl.java
src/main/java/org/olat/modules/opencast/ui/EventDataModel.java 111 additions, 0 deletions

...ain/java/org/olat/modules/opencast/ui/EventDataModel.java
src/main/java/org/olat/modules/opencast/ui/EventListController.java 166 additions, 0 deletions

...ava/org/olat/modules/opencast/ui/EventListController.java
src/main/java/org/olat/modules/opencast/ui/_i18n/LocalStrings_de.properties 8 additions, 1 deletion

...olat/modules/opencast/ui/_i18n/LocalStrings_de.properties

with 457 additions and 11 deletions

Please register or to comment