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

bbafe33f

Commit bbafe33f authored 6 years ago by srosse

Downloads
- Plain Diff

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

parents 2d964e3b 172c61b7

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/ims/qti21/ui/components/FlowComponentRenderer.java 0 additions, 7 deletions

...g/olat/ims/qti21/ui/components/FlowComponentRenderer.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/ChoiceInteractionStatisticsController.java 3 additions, 4 deletions

...s/interactions/ChoiceInteractionStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/HottextInteractionStatisticsController.java 16 additions, 13 deletions

.../interactions/HottextInteractionStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/KPrimStatisticsController.java 0 additions, 1 deletion

...ui/statistics/interactions/KPrimStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/MatchStatisticsController.java 0 additions, 1 deletion

...ui/statistics/interactions/MatchStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/ResponseInfos.java 5 additions, 5 deletions

...t/ims/qti21/ui/statistics/interactions/ResponseInfos.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/SimpleChoiceInteractionStatisticsController.java 15 additions, 13 deletions

...ractions/SimpleChoiceInteractionStatisticsController.java
src/main/webapp/static/js/jquery/openolat/jquery.paint.js 16 additions, 2 deletions

src/main/webapp/static/js/jquery/openolat/jquery.paint.js

with 55 additions and 46 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