Merge with 62829db8f001ebf56699ee3547b9ca59fb689732 (ebe7c751) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit ebe7c751 authored 6 years ago by uhensler

Browse files

Merge with 62829db8f001ebf56699ee3547b9ca59fb689732

parents 7e554079 529857e1

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/course/CourseLeaveDialogBoxController.java 5 additions, 1 deletion

...lat/admin/user/course/CourseLeaveDialogBoxController.java
src/main/java/org/olat/admin/user/course/CourseOverviewController.java 20 additions, 18 deletions

.../org/olat/admin/user/course/CourseOverviewController.java
src/main/java/org/olat/basesecurity/OrganisationRoles.java 2 additions, 0 deletions

src/main/java/org/olat/basesecurity/OrganisationRoles.java
src/main/java/org/olat/basesecurity/OrganisationService.java 2 additions, 0 deletions

src/main/java/org/olat/basesecurity/OrganisationService.java
src/main/java/org/olat/basesecurity/manager/OrganisationDAO.java 15 additions, 0 deletions

...n/java/org/olat/basesecurity/manager/OrganisationDAO.java
src/main/java/org/olat/basesecurity/manager/OrganisationServiceImpl.java 5 additions, 0 deletions

...rg/olat/basesecurity/manager/OrganisationServiceImpl.java
src/main/java/org/olat/commons/memberlist/ui/MembersListDisplayRunController.java 2 additions, 2 deletions

...ommons/memberlist/ui/MembersListDisplayRunController.java
src/main/java/org/olat/commons/memberlist/ui/MembersTableController.java 17 additions, 16 deletions

...rg/olat/commons/memberlist/ui/MembersTableController.java
src/main/java/org/olat/course/member/MemberListController.java 2 additions, 2 deletions

...ain/java/org/olat/course/member/MemberListController.java
src/main/java/org/olat/course/member/MemberListWithOriginFilterController.java 8 additions, 12 deletions

...t/course/member/MemberListWithOriginFilterController.java
src/main/java/org/olat/course/member/MemberSearchController.java 2 additions, 2 deletions

...n/java/org/olat/course/member/MemberSearchController.java
src/main/java/org/olat/course/member/MemberSearchForm.java 17 additions, 20 deletions

src/main/java/org/olat/course/member/MemberSearchForm.java
src/main/java/org/olat/course/member/MembersManagementMainController.java 1 addition, 1 deletion

...g/olat/course/member/MembersManagementMainController.java
src/main/java/org/olat/course/member/MembersOverviewController.java 6 additions, 5 deletions

...ava/org/olat/course/member/MembersOverviewController.java
src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties 4 additions, 4 deletions

...a/org/olat/course/member/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties 5 additions, 4 deletions

...a/org/olat/course/member/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/member/_i18n/LocalStrings_fr.properties 4 additions, 4 deletions

...a/org/olat/course/member/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/member/_i18n/LocalStrings_it.properties 4 additions, 4 deletions

...a/org/olat/course/member/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/member/_i18n/LocalStrings_pl.properties 4 additions, 4 deletions

...a/org/olat/course/member/_i18n/LocalStrings_pl.properties
src/main/java/org/olat/course/member/_i18n/LocalStrings_pt_BR.properties 4 additions, 4 deletions

...rg/olat/course/member/_i18n/LocalStrings_pt_BR.properties

with 129 additions and 103 deletions

Please register or to comment