Merge OpenOLAT 9.3 to OpenOLAT default branch with 96ed2b32caea30bd965a05483e5d19c462b172f1 (c5b141b5) · 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

c5b141b5

Commit c5b141b5 authored 11 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 9.3 to OpenOLAT default branch with 96ed2b32caea30bd965a05483e5d19c462b172f1

parents c805e37b 9dfd31c8

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/user/imp/ImportStep00.java 6 additions, 7 deletions

src/main/java/org/olat/admin/user/imp/ImportStep00.java
src/main/java/org/olat/admin/user/imp/ImportStep01.java 21 additions, 7 deletions

src/main/java/org/olat/admin/user/imp/ImportStep01.java
src/main/java/org/olat/admin/user/imp/UpdateIdentity.java 178 additions, 3 deletions

src/main/java/org/olat/admin/user/imp/UpdateIdentity.java
src/main/java/org/olat/admin/user/imp/UserImportController.java 17 additions, 8 deletions

...in/java/org/olat/admin/user/imp/UserImportController.java
src/main/java/org/olat/admin/user/imp/_content/step1.html 7 additions, 1 deletion

src/main/java/org/olat/admin/user/imp/_content/step1.html
src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

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

.../org/olat/admin/user/imp/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/basiclti/CourseNodeOutcomeMapper.java 1 addition, 1 deletion

...g/olat/course/nodes/basiclti/CourseNodeOutcomeMapper.java
src/main/java/org/olat/course/run/RunMainController.java 7 additions, 8 deletions

src/main/java/org/olat/course/run/RunMainController.java

with 239 additions and 35 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