Merge OpenOLAT 10.3 to OpenOLAT default branch with 86e999f4750daad9d47a3134515998f941765417 (e17a0f63) · 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

e17a0f63

Commit e17a0f63 authored 9 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 10.3 to OpenOLAT default branch with 86e999f4750daad9d47a3134515998f941765417

parents 639c363c 8e4fe899

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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/util/mail/ui/MailSettingsAdminController.java 0 additions, 1 deletion

...g/olat/core/util/mail/ui/MailSettingsAdminController.java
src/main/java/org/olat/core/util/mail/ui/MailTemplateAdminController.java 0 additions, 1 deletion

...g/olat/core/util/mail/ui/MailTemplateAdminController.java
src/main/java/org/olat/group/ui/main/BGTableItem.java 3 additions, 1 deletion

src/main/java/org/olat/group/ui/main/BGTableItem.java

with 100 additions and 65 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