Merge OpenOLAT default branch to OpenOLAT qti with 638eb8ebe48106494861de5c2465e281e8820c3f (0aaf9405) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 0aaf9405 authored 9 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT qti with 638eb8ebe48106494861de5c2465e281e8820c3f

parents f113e89e 00429052

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

src/main/java/org/olat/core/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

src/main/java/org/olat/core/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java 3 additions, 3 deletions

...olat/core/gui/components/form/flexible/FormUIFactory.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/components/SimpleLabelText.java 1 addition, 1 deletion

...onents/form/flexible/impl/components/SimpleLabelText.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java 4 additions, 2 deletions

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

.../flexible/impl/elements/richText/RichTextElementImpl.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/TinyMCECustomPlugin.java 5 additions, 3 deletions

...e/impl/elements/richText/plugins/TinyMCECustomPlugin.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmatheditor/OlatMathEditorPlugin.java 5 additions, 12 deletions

...richText/plugins/olatmatheditor/OlatMathEditorPlugin.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java 21 additions, 17 deletions

...chText/plugins/olatmovieviewer/OlatMovieViewerPlugin.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatsmileys/OlatSmileysPlugin.java 7 additions, 8 deletions

...ments/richText/plugins/olatsmileys/OlatSmileysPlugin.java
src/main/java/org/olat/core/gui/components/helpTooltip/HelpTooltip.java 160 additions, 0 deletions

...org/olat/core/gui/components/helpTooltip/HelpTooltip.java
src/main/java/org/olat/core/gui/components/helpTooltip/HelpTooltipRenderer.java 88 additions, 0 deletions

.../core/gui/components/helpTooltip/HelpTooltipRenderer.java
src/main/java/org/olat/course/CourseFactory.java 12 additions, 4 deletions

src/main/java/org/olat/course/CourseFactory.java
src/main/java/org/olat/gui/demo/guidemo/GuiDemoTooltipsController.java 8 additions, 0 deletions

.../org/olat/gui/demo/guidemo/GuiDemoTooltipsController.java
src/main/java/org/olat/gui/demo/guidemo/_content/tooltips.html 9 additions, 0 deletions

...ain/java/org/olat/gui/demo/guidemo/_content/tooltips.html
src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_ar.properties 2 additions, 2 deletions

...rg/olat/gui/demo/guidemo/_i18n/LocalStrings_ar.properties
src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...rg/olat/gui/demo/guidemo/_i18n/LocalStrings_de.properties
src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_en.properties 2 additions, 2 deletions

...rg/olat/gui/demo/guidemo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_es.properties 2 additions, 2 deletions

...rg/olat/gui/demo/guidemo/_i18n/LocalStrings_es.properties
src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

...rg/olat/gui/demo/guidemo/_i18n/LocalStrings_fr.properties

with 341 additions and 66 deletions

Please register or to comment