Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (77bdac6c) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 77bdac6c authored 5 years ago by srosse

Browse files

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents e616844b dd96abe5

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/admin/user/UserCreateController.java 3 additions, 0 deletions

src/main/java/org/olat/admin/user/UserCreateController.java
src/main/java/org/olat/admin/user/UserShortDescription.java 61 additions, 0 deletions

src/main/java/org/olat/admin/user/UserShortDescription.java
src/main/java/org/olat/admin/user/_content/userShortDescription.html 6 additions, 0 deletions

...va/org/olat/admin/user/_content/userShortDescription.html
src/main/java/org/olat/core/gui/exception/ExceptionWindowController.java 3 additions, 4 deletions

...rg/olat/core/gui/exception/ExceptionWindowController.java
src/main/java/org/olat/course/assessment/ui/tool/AssessedIdentityLargeInfosController.java 31 additions, 2 deletions

...essment/ui/tool/AssessedIdentityLargeInfosController.java
src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseController.java 2 additions, 2 deletions

...ssessment/ui/tool/AssessmentIdentityCourseController.java
src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java 7 additions, 18 deletions

...sment/ui/tool/AssessmentIdentityCourseNodeController.java
src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java 1 addition, 0 deletions

.../assessment/ui/tool/IdentityListCourseNodeController.java
src/main/java/org/olat/course/assessment/ui/tool/_content/identity_personal_node_infos.html 4 additions, 41 deletions

...ssment/ui/tool/_content/identity_personal_node_infos.html
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties 1 addition, 2 deletions

...ourse/assessment/ui/tool/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_en.properties 0 additions, 1 deletion

...ourse/assessment/ui/tool/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_fr.properties 0 additions, 1 deletion

...ourse/assessment/ui/tool/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_it.properties 0 additions, 1 deletion

...ourse/assessment/ui/tool/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_pt_BR.properties 0 additions, 1 deletion

...se/assessment/ui/tool/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/MSCourseNode.java 83 additions, 17 deletions

src/main/java/org/olat/course/nodes/MSCourseNode.java
src/main/java/org/olat/course/nodes/cl/ui/AssessedIdentityOverviewController.java 2 additions, 1 deletion

...ourse/nodes/cl/ui/AssessedIdentityOverviewController.java
src/main/java/org/olat/course/nodes/ms/MSConfigController.java 5 additions, 2 deletions

...ain/java/org/olat/course/nodes/ms/MSConfigController.java
src/main/java/org/olat/course/nodes/ms/MSIdentityListCourseNodeController.java 63 additions, 1 deletion

...t/course/nodes/ms/MSIdentityListCourseNodeController.java
src/main/java/org/olat/course/nodes/ms/MSResetDataController.java 143 additions, 0 deletions

.../java/org/olat/course/nodes/ms/MSResetDataController.java
src/main/java/org/olat/course/nodes/ms/MSService.java 6 additions, 0 deletions

src/main/java/org/olat/course/nodes/ms/MSService.java

with 421 additions and 94 deletions

Please register or to comment