Merge remote-tracking branch 'origin/OpenOLAT_15.1' into OpenOLAT_15.2 (7053cc2d) · 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

7053cc2d

Commit 7053cc2d authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_15.1' into OpenOLAT_15.2

parents 822b7334 4db81572

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/services/pdf/dispatcher/PdfDeliveryDispatcher.java 40 additions, 27 deletions

...ommons/services/pdf/dispatcher/PdfDeliveryDispatcher.java
src/main/java/org/olat/core/commons/services/pdf/manager/AthenaPdfSPI.java 5 additions, 1 deletion

.../olat/core/commons/services/pdf/manager/AthenaPdfSPI.java
src/main/java/org/olat/core/commons/services/pdf/model/PdfDelivery.java 22 additions, 1 deletion

...org/olat/core/commons/services/pdf/model/PdfDelivery.java
src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java 5 additions, 3 deletions

...g/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
src/main/java/org/olat/modules/ceditor/ui/ImageRunController.java 3 additions, 1 deletion

.../java/org/olat/modules/ceditor/ui/ImageRunController.java
src/main/java/org/olat/modules/ceditor/ui/PageController.java 1 addition, 1 deletion

...main/java/org/olat/modules/ceditor/ui/PageController.java
src/main/java/org/olat/modules/ceditor/ui/PageRunControllerElement.java 9 additions, 1 deletion

...org/olat/modules/ceditor/ui/PageRunControllerElement.java
src/main/java/org/olat/modules/ceditor/ui/component/PageFragmentsComponent.java 15 additions, 1 deletion

.../modules/ceditor/ui/component/PageFragmentsComponent.java
src/main/java/org/olat/modules/portfolio/ui/media/VideoMediaController.java 4 additions, 2 deletions

...olat/modules/portfolio/ui/media/VideoMediaController.java
src/main/java/org/olat/modules/quality/manager/QualityReportAccessDAO.java 20 additions, 20 deletions

.../olat/modules/quality/manager/QualityReportAccessDAO.java

with 124 additions and 58 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