Merge remote-tracking branch 'origin/OpenOLAT_14.2' (014b4a57) · 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

014b4a57

Commit 014b4a57 authored 5 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2'

parents 875428f4 debfa339

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/member/MembersOverviewController.java 16 additions, 5 deletions

...ava/org/olat/course/member/MembersOverviewController.java
src/main/java/org/olat/course/member/wizard/ImportMemberPermissionChoiceController.java 4 additions, 9 deletions

...member/wizard/ImportMemberPermissionChoiceController.java
src/main/java/org/olat/course/member/wizard/ImportMember_1a_LoginListStep.java 2 additions, 5 deletions

...t/course/member/wizard/ImportMember_1a_LoginListStep.java
src/main/java/org/olat/course/member/wizard/ImportMember_1b_ChooseMemberStep.java 2 additions, 5 deletions

...ourse/member/wizard/ImportMember_1b_ChooseMemberStep.java
src/main/java/org/olat/course/member/wizard/ImportMember_2_ConfirmMemberChoiceStep.java 2 additions, 6 deletions

...member/wizard/ImportMember_2_ConfirmMemberChoiceStep.java
src/main/java/org/olat/course/member/wizard/ImportMember_3_ChoosePermissionStep.java 5 additions, 15 deletions

...se/member/wizard/ImportMember_3_ChoosePermissionStep.java
src/main/java/org/olat/course/member/wizard/ImportMembersContext.java 81 additions, 0 deletions

...a/org/olat/course/member/wizard/ImportMembersContext.java
src/main/java/org/olat/group/ui/edit/BusinessGroupMembersController.java 13 additions, 12 deletions

...rg/olat/group/ui/edit/BusinessGroupMembersController.java
src/main/java/org/olat/group/ui/main/EditMembershipController.java 64 additions, 19 deletions

...java/org/olat/group/ui/main/EditMembershipController.java
src/main/java/org/olat/modules/curriculum/ui/CurriculumComposerController.java 9 additions, 2 deletions

...t/modules/curriculum/ui/CurriculumComposerController.java
src/main/java/org/olat/modules/curriculum/ui/CurriculumComposerTableModel.java 4 additions, 0 deletions

...t/modules/curriculum/ui/CurriculumComposerTableModel.java
src/main/java/org/olat/repository/ui/author/RepositoryMembersController.java 5 additions, 2 deletions

...lat/repository/ui/author/RepositoryMembersController.java

with 207 additions and 80 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