Merge OpenOLAT 11.3 to OpenOLAT default branch with 07a9438f20f4eae10c36eaf2b6656a7cc187576f (666cd7f3) · 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

666cd7f3

Commit 666cd7f3 authored 8 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 11.3 to OpenOLAT default branch with 07a9438f20f4eae10c36eaf2b6656a7cc187576f

parents 76a2ea00 cbe4cfb7

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/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java 13 additions, 0 deletions

...lexible/impl/elements/richText/RichTextConfiguration.java
src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java 9 additions, 6 deletions

...core/gui/control/generic/iframe/IFrameDeliveryMapper.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBEditorController.java 3 additions, 3 deletions

...ims/qti21/ui/editor/interactions/FIBEditorController.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBNumericalEntrySettingsController.java 12 additions, 2 deletions

...tor/interactions/FIBNumericalEntrySettingsController.java
src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBTextEntrySettingsController.java 12 additions, 3 deletions

...i/editor/interactions/FIBTextEntrySettingsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/QTI21StatisticResourceResult.java 3 additions, 3 deletions

...ims/qti21/ui/statistics/QTI21StatisticResourceResult.java
src/main/java/org/olat/modules/qpool/ui/admin/PoolsAdminController.java 43 additions, 60 deletions

...org/olat/modules/qpool/ui/admin/PoolsAdminController.java
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...at/user/propertyhandlers/_i18n/LocalStrings_de.properties
src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...at/user/propertyhandlers/_i18n/LocalStrings_en.properties

with 97 additions and 77 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