Merge branch 'master' into devel_vfsAdminGUI (333fdd36) · 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

333fdd36

Commit 333fdd36 authored 5 years ago by aboeckle

Downloads
- Plain Diff

Merge branch 'master' into devel_vfsAdminGUI

parents ea7d915c 2d7c4621

No related branches found

No related tags found

No related merge requests found

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/gui/components/image/ImageComponent.java 12 additions, 1 deletion

...va/org/olat/core/gui/components/image/ImageComponent.java
src/main/java/org/olat/core/gui/components/image/ImageRenderer.java 9 additions, 7 deletions

...ava/org/olat/core/gui/components/image/ImageRenderer.java
src/main/java/org/olat/course/assessment/ui/tool/_content/assessment_mode_overview_row.html 1 addition, 1 deletion

...ssment/ui/tool/_content/assessment_mode_overview_row.html
src/main/java/org/olat/ims/qti21/pool/QTI21ExportProcessor.java 13 additions, 2 deletions

...in/java/org/olat/ims/qti21/pool/QTI21ExportProcessor.java
src/main/java/org/olat/ims/qti21/pool/QTI21QPoolServiceProvider.java 9 additions, 2 deletions

...va/org/olat/ims/qti21/pool/QTI21QPoolServiceProvider.java
src/main/java/org/olat/ims/qti21/repository/handlers/QTI21AssessmentTestHandler.java 1 addition, 1 deletion

...qti21/repository/handlers/QTI21AssessmentTestHandler.java
src/main/java/org/olat/ims/qti21/ui/_content/assessment_results.html 8 additions, 12 deletions

...va/org/olat/ims/qti21/ui/_content/assessment_results.html
src/main/java/org/olat/ims/qti21/ui/components/_content/hotspotInteraction.html 0 additions, 2 deletions

.../ims/qti21/ui/components/_content/hotspotInteraction.html
src/main/java/org/olat/modules/ceditor/ui/ImageEditorController.java 6 additions, 4 deletions

...va/org/olat/modules/ceditor/ui/ImageEditorController.java
src/main/java/org/olat/modules/ceditor/ui/ImageRunController.java 54 additions, 46 deletions

.../java/org/olat/modules/ceditor/ui/ImageRunController.java
src/main/webapp/static/js/jquery/qti/jquery.hotspot.js 4 additions, 3 deletions

src/main/webapp/static/js/jquery/qti/jquery.hotspot.js
src/main/webapp/static/js/jquery/qti/jquery.hotspot.responsive.js 15 additions, 4 deletions

.../webapp/static/js/jquery/qti/jquery.hotspot.responsive.js
src/main/webapp/static/js/jquery/qti/jquery.qti.min.js 1 addition, 1 deletion

src/main/webapp/static/js/jquery/qti/jquery.qti.min.js

with 133 additions and 86 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