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

950577ad

Commit 950577ad authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 9eef7005 5192e595

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/admin/user/course/CourseOverviewController.java 23 additions, 1 deletion

.../org/olat/admin/user/course/CourseOverviewController.java
src/main/java/org/olat/admin/user/course/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...g/olat/admin/user/course/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/user/course/_i18n/LocalStrings_en.properties 3 additions, 1 deletion

...g/olat/admin/user/course/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/user/course/_i18n/LocalStrings_fr.properties 2 additions, 0 deletions

...g/olat/admin/user/course/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/util/mail/MailTemplate.java 25 additions, 0 deletions

src/main/java/org/olat/core/util/mail/MailTemplate.java
src/main/java/org/olat/course/nodes/gta/ui/GTAMailTemplate.java 1 addition, 8 deletions

...in/java/org/olat/course/nodes/gta/ui/GTAMailTemplate.java
src/main/java/org/olat/group/BusinessGroupService.java 0 additions, 3 deletions

src/main/java/org/olat/group/BusinessGroupService.java
src/main/java/org/olat/group/manager/BusinessGroupMailing.java 2 additions, 0 deletions

...ain/java/org/olat/group/manager/BusinessGroupMailing.java
src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java 23 additions, 24 deletions

...java/org/olat/group/manager/BusinessGroupServiceImpl.java
src/main/java/org/olat/group/ui/BGMailHelper.java 3 additions, 4 deletions

src/main/java/org/olat/group/ui/BGMailHelper.java
src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...a/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/repository/RepositoryMailing.java 1 addition, 2 deletions

src/main/java/org/olat/repository/RepositoryMailing.java

with 86 additions and 44 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