Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2 (8ce5752c) · 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

8ce5752c

Commit 8ce5752c authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2

parents 82e9e159 326da036

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/ims/qti21/resultexport/_content/qti21results.html 1 addition, 0 deletions

...rg/olat/ims/qti21/resultexport/_content/qti21results.html
src/main/java/org/olat/ims/qti21/ui/_content/assessment_results.html 6 additions, 4 deletions

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

.../ims/qti21/ui/components/_content/hotspotInteraction.html
src/main/java/org/olat/ims/qti21/ui/statistics/QTI21AssessmentItemStatisticsController.java 1 addition, 0 deletions

...i/statistics/QTI21AssessmentItemStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/QTI21ItemBodyController.java 7 additions, 1 deletion

...olat/ims/qti21/ui/statistics/QTI21ItemBodyController.java
src/main/java/org/olat/ims/qti21/ui/statistics/_content/print.html 6 additions, 1 deletion

...java/org/olat/ims/qti21/ui/statistics/_content/print.html
src/main/java/org/olat/ims/qti21/ui/statistics/_content/statistics_item.html 2 additions, 0 deletions

...lat/ims/qti21/ui/statistics/_content/statistics_item.html
src/main/webapp/static/js/jquery/maphilight/jquery.maphilight.js 118 additions, 183 deletions

...n/webapp/static/js/jquery/maphilight/jquery.maphilight.js
src/main/webapp/static/js/jquery/qti/jquery.hotspot.responsive.js 87 additions, 48 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 231 additions and 240 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