Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.0 (f6bf98aa) · 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

f6bf98aa

Commit f6bf98aa authored 4 years ago by srosse

Downloads
- Plain Diff

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

parents bf811b80 414be97d

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/commons/info/notification/InfoSubscriptionManagerImpl.java 1 addition, 1 deletion

...ommons/info/notification/InfoSubscriptionManagerImpl.java
src/main/java/org/olat/core/commons/services/notifications/NotificationsManager.java 2 additions, 1 deletion

.../commons/services/notifications/NotificationsManager.java
src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java 11 additions, 2 deletions

...vices/notifications/manager/NotificationsManagerImpl.java
src/main/java/org/olat/core/commons/services/notifications/model/SubscriberImpl.java 0 additions, 1 deletion

.../commons/services/notifications/model/SubscriberImpl.java
src/main/java/org/olat/core/util/openxml/HTMLToOpenXMLHandler.java 28 additions, 19 deletions

...java/org/olat/core/util/openxml/HTMLToOpenXMLHandler.java
src/main/java/org/olat/core/util/openxml/OpenXMLDocument.java 36 additions, 6 deletions

...main/java/org/olat/core/util/openxml/OpenXMLDocument.java
src/main/java/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java 5 additions, 0 deletions

...a/org/olat/ims/qti21/manager/openxml/QTI21WordExport.java
src/main/java/org/olat/ims/qti21/ui/editor/AssessmentItemEditorController.java 5 additions, 3 deletions

...t/ims/qti21/ui/editor/AssessmentItemEditorController.java
src/test/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerTest.java 20 additions, 7 deletions

...vices/notifications/manager/NotificationsManagerTest.java

with 108 additions and 40 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