Merge OpenOLAT default branch to OpenOLAT qti with c49d0196a22e8a312cc365ee5fc256cb9e90177c (f98e0e1f) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit f98e0e1f authored 9 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT qti with c49d0196a22e8a312cc365ee5fc256cb9e90177c

parents 570ba902 70347f22

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/bps/course/nodes/ll/LLEditForm.java 1 addition, 1 deletion

src/main/java/de/bps/course/nodes/ll/LLEditForm.java
src/main/java/org/olat/core/commons/controllers/linkchooser/LinkChooserController.java 2 additions, 2 deletions

...ommons/controllers/linkchooser/LinkChooserController.java
src/main/java/org/olat/core/commons/controllers/linkchooser/MediaChooserController.java 2 additions, 2 deletions

...mmons/controllers/linkchooser/MediaChooserController.java
src/main/java/org/olat/core/commons/modules/bc/FileCopyController.java 1 addition, 1 deletion

.../org/olat/core/commons/modules/bc/FileCopyController.java
src/main/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java 4 additions, 21 deletions

...in/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java 9 additions, 0 deletions

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

...ible/impl/elements/richText/RichTextElementComponent.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java 1 addition, 0 deletions

...m/flexible/impl/elements/table/FlexiTableElementImpl.java
src/main/java/org/olat/core/gui/control/generic/iframe/DeliveryOptionsConfigurationController.java 2 additions, 0 deletions

...eneric/iframe/DeliveryOptionsConfigurationController.java
src/main/java/org/olat/core/gui/control/generic/iframe/_i18n/LocalStrings_de.properties 3 additions, 13 deletions

...i/control/generic/iframe/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/gui/control/generic/iframe/_i18n/LocalStrings_en.properties 2 additions, 11 deletions

...i/control/generic/iframe/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/gui/exception/_content/exception_page.html 5 additions, 14 deletions

.../org/olat/core/gui/exception/_content/exception_page.html
src/main/java/org/olat/core/util/mail/ContactList.java 0 additions, 3 deletions

src/main/java/org/olat/core/util/mail/ContactList.java
src/main/java/org/olat/course/nodes/CPCourseNode.java 0 additions, 8 deletions

src/main/java/org/olat/course/nodes/CPCourseNode.java
src/main/java/org/olat/course/nodes/IQSELFCourseNode.java 0 additions, 7 deletions

src/main/java/org/olat/course/nodes/IQSELFCourseNode.java
src/main/java/org/olat/course/nodes/IQSURVCourseNode.java 0 additions, 7 deletions

src/main/java/org/olat/course/nodes/IQSURVCourseNode.java
src/main/java/org/olat/course/nodes/IQTESTCourseNode.java 0 additions, 10 deletions

src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
src/main/java/org/olat/course/nodes/ScormCourseNode.java 0 additions, 7 deletions

src/main/java/org/olat/course/nodes/ScormCourseNode.java
src/main/java/org/olat/course/nodes/fo/SettingsController.java 2 additions, 3 deletions

...ain/java/org/olat/course/nodes/fo/SettingsController.java
src/main/java/org/olat/course/nodes/fo/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...org/olat/course/nodes/fo/_i18n/LocalStrings_de.properties

with 39 additions and 114 deletions

Please register or to comment