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

Commit 9e481dec authored 9 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT qti with ebf8dc3125c3e5ef462af104e0695b893541f83a

parents 7d76b5bb 16806fdc

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/collaboration/CollaborationToolsSettingsController.java 21 additions, 17 deletions

...t/collaboration/CollaborationToolsSettingsController.java
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_fr.properties 4 additions, 1 deletion

...rg/olat/commons/calendar/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/services/notifications/NotificationHelper.java 5 additions, 9 deletions

...re/commons/services/notifications/NotificationHelper.java
src/main/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java 38 additions, 20 deletions

...in/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java
src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml 4 additions, 1 deletion

...va/org/olat/core/dispatcher/_spring/dispatcherContext.xml
src/main/java/org/olat/core/gui/control/generic/iframe/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

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

...i/control/generic/iframe/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/util/i18n/devtools/_i18n/LocalStrings_fr.properties 50 additions, 1 deletion

.../core/util/i18n/devtools/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/util/openxml/HTMLToOpenXMLHandler.java 5 additions, 2 deletions

...java/org/olat/core/util/openxml/HTMLToOpenXMLHandler.java
src/main/java/org/olat/course/nodes/fo/_i18n/LocalStrings_fr.properties 5 additions, 5 deletions

...org/olat/course/nodes/fo/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties 35 additions, 1 deletion

...olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_fr.properties 2 additions, 68 deletions

...a/org/olat/group/ui/edit/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/group/ui/wizard/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...org/olat/group/ui/wizard/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/ims/qti/editor/_i18n/LocalStrings_fr.properties 4 additions, 1 deletion

.../org/olat/ims/qti/editor/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/fo/ForumNotificationsHandler.java 5 additions, 1 deletion

...n/java/org/olat/modules/fo/ForumNotificationsHandler.java
src/main/java/org/olat/modules/fo/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...java/org/olat/modules/fo/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/fo/_i18n/LocalStrings_en.properties 3 additions, 0 deletions

...java/org/olat/modules/fo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/fo/_i18n/LocalStrings_fr.properties 17 additions, 2 deletions

...java/org/olat/modules/fo/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/fo/archiver/formatters/ForumOpenXMLFormatter.java 32 additions, 12 deletions

...modules/fo/archiver/formatters/ForumOpenXMLFormatter.java
src/main/java/org/olat/modules/fo/manager/ForumManager.java 72 additions, 58 deletions

src/main/java/org/olat/modules/fo/manager/ForumManager.java

with 310 additions and 213 deletions

Please register or to comment