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

Commit 5e7291d9 authored 4 years ago by Andreas Parschalk

Browse files

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

parents f0798ffa 4a3e3a20

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/commons/services/license/manager/ResourceLicenseDAO.java 12 additions, 2 deletions

.../commons/services/license/manager/ResourceLicenseDAO.java
src/main/java/org/olat/core/util/resource/Resourceable.java 5 additions, 0 deletions

src/main/java/org/olat/core/util/resource/Resourceable.java
src/main/java/org/olat/course/nodes/cl/ui/CheckListBoxListEditController.java 5 additions, 3 deletions

...at/course/nodes/cl/ui/CheckListBoxListEditController.java
src/main/java/org/olat/course/nodes/cl/ui/CheckListConfigurationController.java 4 additions, 0 deletions

.../course/nodes/cl/ui/CheckListConfigurationController.java
src/main/java/org/olat/course/nodes/cl/ui/CheckboxEditController.java 4 additions, 0 deletions

...a/org/olat/course/nodes/cl/ui/CheckboxEditController.java
src/main/java/org/olat/ims/qti21/QTI21Service.java 6 additions, 0 deletions

src/main/java/org/olat/ims/qti21/QTI21Service.java
src/main/java/org/olat/ims/qti21/manager/QTI21ServiceImpl.java 23 additions, 0 deletions

...ain/java/org/olat/ims/qti21/manager/QTI21ServiceImpl.java
src/main/java/org/olat/ims/qti21/pool/ImportExportHelper.java 6 additions, 6 deletions

...main/java/org/olat/ims/qti21/pool/ImportExportHelper.java
src/main/java/org/olat/ims/qti21/pool/QTI21ExportProcessor.java 2 additions, 2 deletions

...in/java/org/olat/ims/qti21/pool/QTI21ExportProcessor.java
src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java 30 additions, 6 deletions

...rg/olat/ims/qti21/ui/AssessmentTestDisplayController.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/editor/AssessmentTestComposerController.java 81 additions, 10 deletions

...ims/qti21/ui/editor/AssessmentTestComposerController.java
src/main/java/org/olat/repository/ui/author/AuthoringEntryDataSource.java 12 additions, 10 deletions

...g/olat/repository/ui/author/AuthoringEntryDataSource.java
src/main/resources/infinispan-config.xml 7 additions, 0 deletions

src/main/resources/infinispan-config.xml
src/test/java/org/olat/core/commons/services/license/manager/ResourceLicenseDAOTest.java 18 additions, 0 deletions

...mons/services/license/manager/ResourceLicenseDAOTest.java
src/test/java/org/olat/selenium/CourseElementTest.java 111 additions, 0 deletions

src/test/java/org/olat/selenium/CourseElementTest.java
src/test/java/org/olat/selenium/page/course/CheckListConfigPage.java 109 additions, 0 deletions

...va/org/olat/selenium/page/course/CheckListConfigPage.java
src/test/java/org/olat/selenium/page/course/CheckListPage.java 53 additions, 0 deletions

...est/java/org/olat/selenium/page/course/CheckListPage.java
src/test/java/org/olat/selenium/page/qti/QTI21Page.java 4 additions, 3 deletions

src/test/java/org/olat/selenium/page/qti/QTI21Page.java

with 494 additions and 42 deletions

Please register or to comment