Merge remote-tracking branch 'origin/OpenOLAT_12.5' (1aa4581e) · 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

1aa4581e

Commit 1aa4581e authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5'

parents 556f2e7a 75d87408

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/commons/memberlist/ui/MembersMailController.java 31 additions, 16 deletions

...org/olat/commons/memberlist/ui/MembersMailController.java
src/main/java/org/olat/commons/memberlist/ui/_i18n/LocalStrings_de.properties 6 additions, 0 deletions

...at/commons/memberlist/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/commons/memberlist/ui/_i18n/LocalStrings_en.properties 7 additions, 1 deletion

...at/commons/memberlist/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/util/mail/ContactList.java 8 additions, 4 deletions

src/main/java/org/olat/core/util/mail/ContactList.java
src/main/java/org/olat/core/util/vfs/MergeSource.java 6 additions, 10 deletions

src/main/java/org/olat/core/util/vfs/MergeSource.java
src/main/java/org/olat/course/MergedCourseContainer.java 3 additions, 382 deletions

src/main/java/org/olat/course/MergedCourseContainer.java
src/main/java/org/olat/course/folder/MergedCourseElementDataContainer.java 517 additions, 0 deletions

.../olat/course/folder/MergedCourseElementDataContainer.java
src/main/java/org/olat/course/folder/MergedPFCourseNodeContainer.java 104 additions, 0 deletions

...a/org/olat/course/folder/MergedPFCourseNodeContainer.java
src/main/java/org/olat/course/nodes/bc/BCCourseNodeRunController.java 3 additions, 2 deletions

...a/org/olat/course/nodes/bc/BCCourseNodeRunController.java
src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java 1 addition, 1 deletion

...rg/olat/course/nodes/iq/QTI21AssessmentRunController.java
src/main/java/org/olat/ims/qti/qpool/QTIImportProcessor.java 3 additions, 1 deletion

src/main/java/org/olat/ims/qti/qpool/QTIImportProcessor.java

with 689 additions and 417 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