Merge remote-tracking branch 'upstream/OpenOLAT_13.2' into OpenOLAT_13.2.uibk (8e900511) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 8e900511 authored 6 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_13.2' into OpenOLAT_13.2.uibk

parents d1d9211d 9d8605c1

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 25 additions, 25 deletions

pom.xml
src/main/java/de/bps/course/nodes/den/DENManageParticipantsController.java 1 addition, 1 deletion

...bps/course/nodes/den/DENManageParticipantsController.java
src/main/java/de/bps/course/nodes/den/DENManager.java 1 addition, 1 deletion

src/main/java/de/bps/course/nodes/den/DENManager.java
src/main/java/de/bps/course/nodes/ll/LLRunController.java 24 additions, 10 deletions

src/main/java/de/bps/course/nodes/ll/LLRunController.java
src/main/java/org/olat/admin/restapi/RestapiAdminController.java 21 additions, 10 deletions

...n/java/org/olat/admin/restapi/RestapiAdminController.java
src/main/java/org/olat/admin/restapi/_i18n/LocalStrings_de.properties 1 addition, 8 deletions

...a/org/olat/admin/restapi/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/restapi/_i18n/LocalStrings_en.properties 1 addition, 8 deletions

...a/org/olat/admin/restapi/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/restapi/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...a/org/olat/admin/restapi/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/restapi/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...rg/olat/admin/restapi/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/admin/securitygroup/gui/multi/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

.../securitygroup/gui/multi/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/securitygroup/gui/multi/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

.../securitygroup/gui/multi/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...a/org/olat/admin/site/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...a/org/olat/admin/site/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

...a/org/olat/admin/site/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...rg/olat/admin/site/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/admin/user/UserAdminController.java 18 additions, 2 deletions

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

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

...java/org/olat/admin/user/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/user/_i18n/LocalStrings_fr.properties 2 additions, 1 deletion

...java/org/olat/admin/user/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/admin/user/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...a/org/olat/admin/user/_i18n/LocalStrings_pt_BR.properties

with 109 additions and 72 deletions

Please register or to comment