Merge remote-tracking branch 'upstream/OpenOLAT_12.5' (4ef2de60) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 4ef2de60 authored 6 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_12.5'

parents 01786192 966988fc

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 27 additions, 10 deletions

.gitignore
pom.xml 49 additions, 10 deletions

pom.xml
src/main/java/org/olat/admin/user/_i18n/LocalStrings_pt_BR.properties 19 additions, 1 deletion

...a/org/olat/admin/user/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/admin/user/groups/GroupSearchController.java 13 additions, 13 deletions

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

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

...g/olat/admin/user/groups/_i18n/LocalStrings_en.properties
src/main/java/org/olat/basesecurity/model/GroupMembershipImpl.java 1 addition, 1 deletion

...java/org/olat/basesecurity/model/GroupMembershipImpl.java
src/main/java/org/olat/collaboration/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...rg/olat/collaboration/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...olat/commons/calendar/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

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

.../core/commons/modules/bc/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/modules/bc/components/ListRenderer.java 6 additions, 0 deletions

...olat/core/commons/modules/bc/components/ListRenderer.java
src/main/java/org/olat/core/gui/components/stack/TooledStackedPanel.java 9 additions, 0 deletions

...rg/olat/core/gui/components/stack/TooledStackedPanel.java
src/main/java/org/olat/core/gui/components/stack/TooledStackedPanelRenderer.java 2 additions, 2 deletions

...core/gui/components/stack/TooledStackedPanelRenderer.java
src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

...g/olat/core/util/mail/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java 1 addition, 1 deletion

...java/org/olat/core/util/mail/manager/MailManagerImpl.java
src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...va/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_pt_BR.properties 2 additions, 1 deletion

.../olat/course/nodes/bc/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/nodes/members/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

.../course/nodes/members/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/course/run/CourseRuntimeController.java 3 additions, 6 deletions

...ain/java/org/olat/course/run/CourseRuntimeController.java

with 143 additions and 50 deletions

Please register or to comment