Merge remote-tracking branch 'origin/OpenOLAT_15.2' (af3dc735) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

af3dc735

Commit af3dc735 authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_15.2'

parents 9dedac65 4e47b03c

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/co/CourseMailTemplate.java 8 additions, 1 deletion

...ain/java/org/olat/course/nodes/co/CourseMailTemplate.java
src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java 2 additions, 1 deletion

...rg/olat/course/nodes/iq/QTI21AssessmentRunController.java
src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java 9 additions, 4 deletions

...rg/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java
src/main/java/org/olat/ims/qti21/resultexport/AssessedMemberComparator.java 61 additions, 0 deletions

...olat/ims/qti21/resultexport/AssessedMemberComparator.java
src/main/java/org/olat/ims/qti21/resultexport/QTI21ResultsExportMediaResource.java 15 additions, 10 deletions

...s/qti21/resultexport/QTI21ResultsExportMediaResource.java
src/main/java/org/olat/ims/qti21/ui/report/QuestionOriginMediaResource.java 93 additions, 5 deletions

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

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

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

...olat/ims/qti21/ui/report/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/reminder/manager/ReminderServiceImpl.java 15 additions, 7 deletions

...rg/olat/modules/reminder/manager/ReminderServiceImpl.java
src/main/java/org/olat/user/manager/lifecycle/UserLifecycleManagerImpl.java 29 additions, 4 deletions

...olat/user/manager/lifecycle/UserLifecycleManagerImpl.java

with 241 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment