Merge remote-tracking branch 'origin/OpenOLAT_13.0' (3d81cd88) · 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

3d81cd88

Commit 3d81cd88 authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_13.0'

parents 48358469 265294d3

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/util/openxml/HTMLToOpenXMLHandler.java 50 additions, 21 deletions

...java/org/olat/core/util/openxml/HTMLToOpenXMLHandler.java
src/main/java/org/olat/core/util/openxml/OpenXMLConstants.java 10 additions, 0 deletions

...ain/java/org/olat/core/util/openxml/OpenXMLConstants.java
src/main/java/org/olat/core/util/openxml/OpenXMLDocument.java 56 additions, 8 deletions

...main/java/org/olat/core/util/openxml/OpenXMLDocument.java
src/main/java/org/olat/course/nodes/co/CORunController.java 12 additions, 6 deletions

src/main/java/org/olat/course/nodes/co/CORunController.java
src/main/java/org/olat/ims/qti/container/qtielements/Render_choice.java 3 additions, 2 deletions

...org/olat/ims/qti/container/qtielements/Render_choice.java
src/main/java/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java 60 additions, 58 deletions

...a/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java

with 191 additions and 95 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