Merge OpenOLAT 9.4 to OpenOLAT default branch with be7e414212b1a70553d2378052063a916bbf0c4a (d95426f5) · 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

d95426f5

Commit d95426f5 authored 10 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 9.4 to OpenOLAT default branch with be7e414212b1a70553d2378052063a916bbf0c4a

parents f8879537 ea726109

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all 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, 1 deletion

...lexible/impl/elements/richText/RichTextConfiguration.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java 3 additions, 4 deletions

...xible/impl/elements/richText/RichTextElementRenderer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...e/impl/elements/richText/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...e/impl/elements/richText/_i18n/LocalStrings_en.properties
src/main/webapp/static/themes/light/content.css 1 addition, 1 deletion

src/main/webapp/static/themes/light/content.css
src/main/webapp/static/themes/light/modules/_content.scss 8 additions, 0 deletions

src/main/webapp/static/themes/light/modules/_content.scss

with 29 additions and 6 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