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

7d3a5a53

Commit 7d3a5a53 authored 6 years ago by srosse

Downloads
- Plain Diff

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

parents fad9777d f04968b2

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/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java 11 additions, 4 deletions

...ible/impl/elements/richText/RichTextElementComponent.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementImpl.java 16 additions, 0 deletions

.../flexible/impl/elements/richText/RichTextElementImpl.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java 13 additions, 2 deletions

...xible/impl/elements/richText/RichTextElementRenderer.java
src/main/java/org/olat/core/util/vfs/restapi/VFSWebservice.java 1 addition, 1 deletion

...in/java/org/olat/core/util/vfs/restapi/VFSWebservice.java
src/main/java/org/olat/course/reminder/ui/CourseReminderListController.java 6 additions, 2 deletions

...olat/course/reminder/ui/CourseReminderListController.java
src/main/java/org/olat/course/reminder/ui/CourseReminderLogsController.java 6 additions, 2 deletions

...olat/course/reminder/ui/CourseReminderLogsController.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/BackgroundSize.java 43 additions, 0 deletions

...olat/ims/qti21/ui/editor/interactions/BackgroundSize.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/DrawingEditorController.java 64 additions, 1 deletion

...qti21/ui/editor/interactions/DrawingEditorController.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotEditorController.java 2 additions, 18 deletions

...qti21/ui/editor/interactions/HotspotEditorController.java
src/test/java/org/olat/restapi/FolderTest.java 28 additions, 5 deletions

src/test/java/org/olat/restapi/FolderTest.java

with 190 additions and 35 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