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

Commit 14827955 authored 4 years ago by User expired

Browse files

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

parents a95e160f 912432bb

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 7 additions, 7 deletions

pom.xml
src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java 12 additions, 7 deletions

.../org/olat/admin/user/UsermanagerUserSearchController.java
src/main/java/org/olat/admin/user/UsermanagerUserSearchForm.java 1 addition, 1 deletion

...n/java/org/olat/admin/user/UsermanagerUserSearchForm.java
src/main/java/org/olat/core/commons/services/jmx/_spring/jmxContext.xml 0 additions, 4 deletions

...org/olat/core/commons/services/jmx/_spring/jmxContext.xml
src/main/java/org/olat/core/gui/components/link/LinkRenderer.java 3 additions, 3 deletions

.../java/org/olat/core/gui/components/link/LinkRenderer.java
src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java 5 additions, 6 deletions

.../assessment/ui/tool/IdentityListCourseNodeController.java
src/main/java/org/olat/course/nodes/gta/ui/GTAIdentityListCourseNodeController.java 4 additions, 3 deletions

...rse/nodes/gta/ui/GTAIdentityListCourseNodeController.java
src/main/java/org/olat/course/nodes/iq/ConfirmReopenAssessmentEntriesController.java 91 additions, 0 deletions

...se/nodes/iq/ConfirmReopenAssessmentEntriesController.java
src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java 59 additions, 5 deletions

...t/course/nodes/iq/IQIdentityListCourseNodeController.java
src/main/java/org/olat/course/nodes/iq/QTI21IdentityListCourseNodeToolsController.java 34 additions, 3 deletions

.../nodes/iq/QTI21IdentityListCourseNodeToolsController.java
src/main/java/org/olat/course/nodes/iq/_content/confirm_reopen_assessments.html 10 additions, 0 deletions

.../course/nodes/iq/_content/confirm_reopen_assessments.html
src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_de.properties 3 additions, 0 deletions

...org/olat/course/nodes/iq/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_en.properties 3 additions, 0 deletions

...org/olat/course/nodes/iq/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/manager/QTI21StatisticsManagerImpl.java 2 additions, 1 deletion

...rg/olat/ims/qti21/manager/QTI21StatisticsManagerImpl.java
src/main/java/org/olat/ims/qti21/questionimport/CSVToAssessmentItemConverter.java 1 addition, 0 deletions

...ms/qti21/questionimport/CSVToAssessmentItemConverter.java
src/main/java/org/olat/ims/qti21/ui/ConfirmReopenAssessmentEntryController.java 144 additions, 0 deletions

.../ims/qti21/ui/ConfirmReopenAssessmentEntryController.java
src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java 37 additions, 4 deletions

...g/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentTestSessionTableModel.java 7 additions, 5 deletions

...at/ims/qti21/ui/QTI21AssessmentTestSessionTableModel.java
src/main/java/org/olat/ims/qti21/ui/_content/confirm_reopen_assessment.html 10 additions, 0 deletions

...olat/ims/qti21/ui/_content/confirm_reopen_assessment.html
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties 7 additions, 3 deletions

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties

with 440 additions and 52 deletions

Please register or to comment