Merge remote-tracking branch 'origin/OpenOLAT_12.5' (d8dd7bfd) · 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

d8dd7bfd

Commit d8dd7bfd authored 6 years ago by srosse

Downloads
- Plain Diff

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

parents 2cb8fb4e 3e7d0fa0

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 1 addition, 1 deletion

pom.xml
src/main/java/org/olat/group/ui/main/BusinessGroupSearchController.java 14 additions, 3 deletions

...org/olat/group/ui/main/BusinessGroupSearchController.java
src/main/java/org/olat/group/ui/main/SelectOwnedBusinessGroupController.java 8 additions, 1 deletion

...lat/group/ui/main/SelectOwnedBusinessGroupController.java
src/main/java/org/olat/modules/vitero/manager/ViteroManager.java 24 additions, 31 deletions

...n/java/org/olat/modules/vitero/manager/ViteroManager.java
src/main/java/org/olat/modules/vitero/ui/ViteroBookingDataModel.java 1 addition, 4 deletions

...va/org/olat/modules/vitero/ui/ViteroBookingDataModel.java
src/main/java/org/olat/modules/vitero/ui/ViteroConfigurationController.java 1 addition, 0 deletions

...olat/modules/vitero/ui/ViteroConfigurationController.java
src/main/java/org/olat/modules/vitero/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...g/olat/modules/vitero/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/vitero/ui/_i18n/LocalStrings_en.properties 2 additions, 1 deletion

...g/olat/modules/vitero/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/vitero/ui/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

...g/olat/modules/vitero/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/vitero/ui/_i18n/LocalStrings_it.properties 1 addition, 0 deletions

...g/olat/modules/vitero/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/modules/vitero/ui/_i18n/LocalStrings_pl.properties 1 addition, 0 deletions

...g/olat/modules/vitero/ui/_i18n/LocalStrings_pl.properties
src/main/java/org/olat/modules/vitero/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions

...lat/modules/vitero/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/vitero/ui/_i18n/LocalStrings_zh_CN.properties 1 addition, 0 deletions

...lat/modules/vitero/ui/_i18n/LocalStrings_zh_CN.properties

with 57 additions and 41 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