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

aad5d27d

Commit aad5d27d authored 6 years ago by srosse

Downloads
- Plain Diff

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

parents 4cef8659 567aad0c

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java 3 additions, 1 deletion

...rg/olat/course/nodes/iq/QTI21AssessmentRunController.java
src/main/java/org/olat/course/run/RunMainController.java 2 additions, 2 deletions

src/main/java/org/olat/course/run/RunMainController.java
src/main/java/org/olat/ims/qti21/ui/editor/FeedbacksEditorController.java 16 additions, 3 deletions

...g/olat/ims/qti21/ui/editor/FeedbacksEditorController.java
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 5 additions, 2 deletions

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

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/repository/handlers/CourseHandler.java 2 additions, 2 deletions

...main/java/org/olat/repository/handlers/CourseHandler.java
src/test/java/org/olat/restapi/ForumTest.java 3 additions, 0 deletions

src/test/java/org/olat/restapi/ForumTest.java

with 36 additions and 10 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