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

Commit acc86b1e authored 9 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT qti with ec33b15844d76f1eca39ab2fb99fbc19ee036457

parents 0f9fe8af e17a0f63

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/_content/edit.html 1 addition, 1 deletion

src/main/java/de/bps/course/nodes/ll/_content/edit.html
src/main/java/de/bps/course/nodes/vc/_chelp/ced-vc-config.html 0 additions, 5 deletions

...ain/java/de/bps/course/nodes/vc/_chelp/ced-vc-config.html
src/main/java/de/tuchemnitz/wizard/workflows/coursecreation/steps/EnrollmentEditForm.java 26 additions, 1 deletion

...rd/workflows/coursecreation/steps/EnrollmentEditForm.java
src/main/java/org/olat/admin/restapi/RestapiAdminController.java 2 additions, 2 deletions

...n/java/org/olat/admin/restapi/RestapiAdminController.java
src/main/java/org/olat/admin/restapi/_chelp/managed.html 0 additions, 69 deletions

src/main/java/org/olat/admin/restapi/_chelp/managed.html
src/main/java/org/olat/admin/restapi/_chelp/rest.html 0 additions, 3 deletions

src/main/java/org/olat/admin/restapi/_chelp/rest.html
src/main/java/org/olat/admin/restapi/_content/rest.html 2 additions, 2 deletions

src/main/java/org/olat/admin/restapi/_content/rest.html
src/main/java/org/olat/admin/user/imp/ImportStep01.java 54 additions, 46 deletions

src/main/java/org/olat/admin/user/imp/ImportStep01.java
src/main/java/org/olat/admin/user/imp/_content/step1.html 28 additions, 10 deletions

src/main/java/org/olat/admin/user/imp/_content/step1.html
src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_de.properties 5 additions, 2 deletions

.../org/olat/admin/user/imp/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_en.properties 5 additions, 2 deletions

.../org/olat/admin/user/imp/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_fr.properties 5 additions, 2 deletions

.../org/olat/admin/user/imp/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

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

src/main/java/org/olat/core/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

src/main/java/org/olat/core/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/modules/bc/_chelp/bc-webdav.html 0 additions, 46 deletions

...va/org/olat/core/commons/modules/bc/_chelp/bc-webdav.html
src/main/java/org/olat/core/util/mail/_chelp/mail-admin-template.html 0 additions, 10 deletions

...a/org/olat/core/util/mail/_chelp/mail-admin-template.html
src/main/java/org/olat/core/util/mail/_chelp/mail-admin.html 0 additions, 17 deletions

src/main/java/org/olat/core/util/mail/_chelp/mail-admin.html
src/main/java/org/olat/core/util/mail/ui/MailSettingsAdminController.java 2 additions, 3 deletions

...g/olat/core/util/mail/ui/MailSettingsAdminController.java
src/main/java/org/olat/core/util/mail/ui/MailTemplateAdminController.java 2 additions, 3 deletions

...g/olat/core/util/mail/ui/MailTemplateAdminController.java

with 135 additions and 224 deletions

Please register or to comment