Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (a204fc67) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit a204fc67 authored 5 years ago by srosse

Browse files

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents 5013caa9 128aa82d

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/basesecurity/manager/IdentityPowerSearchQueriesImpl.java 8 additions, 1 deletion

.../basesecurity/manager/IdentityPowerSearchQueriesImpl.java
src/main/java/org/olat/course/nodes/iq/IQConfigurationController.java 9 additions, 2 deletions

...a/org/olat/course/nodes/iq/IQConfigurationController.java
src/main/java/org/olat/ims/qti21/AssessmentTestSession.java 2 additions, 1 deletion

src/main/java/org/olat/ims/qti21/AssessmentTestSession.java
src/main/java/org/olat/ims/qti21/QTI21Service.java 13 additions, 3 deletions

src/main/java/org/olat/ims/qti21/QTI21Service.java
src/main/java/org/olat/ims/qti21/manager/QTI21ServiceImpl.java 12 additions, 2 deletions

...ain/java/org/olat/ims/qti21/manager/QTI21ServiceImpl.java
src/main/java/org/olat/ims/qti21/model/InMemoryAssessmentTestSession.java 5 additions, 0 deletions

...g/olat/ims/qti21/model/InMemoryAssessmentTestSession.java
src/main/java/org/olat/ims/qti21/model/jpa/AssessmentTestSessionImpl.java 1 addition, 0 deletions

...g/olat/ims/qti21/model/jpa/AssessmentTestSessionImpl.java
src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java 23 additions, 3 deletions

...rg/olat/ims/qti21/ui/AssessmentTestDisplayController.java
src/main/java/org/olat/ims/qti21/ui/QTI21RuntimeController.java 31 additions, 1 deletion

...in/java/org/olat/ims/qti21/ui/QTI21RuntimeController.java
src/main/java/org/olat/ims/qti21/ui/QTIWorksAssessmentTestEvent.java 2 additions, 1 deletion

...va/org/olat/ims/qti21/ui/QTIWorksAssessmentTestEvent.java
src/main/java/org/olat/ims/qti21/ui/_content/at_run.html 15 additions, 11 deletions

src/main/java/org/olat/ims/qti21/ui/_content/at_run.html
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties 2 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 2 additions, 0 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/components/AssessmentTestComponentRenderer.java 38 additions, 11 deletions

.../qti21/ui/components/AssessmentTestComponentRenderer.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentTestFormItem.java 5 additions, 0 deletions

.../olat/ims/qti21/ui/components/AssessmentTestFormItem.java
src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java 14 additions, 2 deletions

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

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

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBEditorController.java 1 addition, 4 deletions

...ims/qti21/ui/editor/interactions/FIBEditorController.java
src/main/java/org/olat/ims/qti21/ui/event/RestartEvent.java 39 additions, 0 deletions

src/main/java/org/olat/ims/qti21/ui/event/RestartEvent.java

with 224 additions and 42 deletions

Please register or to comment