Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (47f852f3) · 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

47f852f3

Commit 47f852f3 authored 5 years ago by srosse

Downloads
- Plain Diff

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents 85f46111 4b7055ce

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/services/doceditor/collabora/CollaboraModule.java 1 addition, 14 deletions

...commons/services/doceditor/collabora/CollaboraModule.java
src/main/java/org/olat/core/commons/services/doceditor/collabora/ui/CollaboraAdminController.java 1 addition, 18 deletions

...ices/doceditor/collabora/ui/CollaboraAdminController.java
src/main/java/org/olat/core/commons/services/doceditor/office365/Office365Module.java 1 addition, 14 deletions

...commons/services/doceditor/office365/Office365Module.java
src/main/java/org/olat/core/commons/services/doceditor/office365/ui/Office365AdminController.java 1 addition, 18 deletions

...ices/doceditor/office365/ui/Office365AdminController.java
src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/OnlyOfficeModule.java 1 addition, 14 deletions

...mmons/services/doceditor/onlyoffice/OnlyOfficeModule.java
src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/ui/OnlyOfficeAdminController.java 1 addition, 25 deletions

...es/doceditor/onlyoffice/ui/OnlyOfficeAdminController.java
src/main/java/org/olat/core/commons/services/doceditor/ui/_i18n/LocalStrings_de.properties 2 additions, 3 deletions

...ns/services/doceditor/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/services/doceditor/ui/_i18n/LocalStrings_en.properties 2 additions, 3 deletions

...ns/services/doceditor/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/services/doceditor/ui/_i18n/LocalStrings_fr.properties 2 additions, 3 deletions

...ns/services/doceditor/ui/_i18n/LocalStrings_fr.properties
src/main/resources/serviceconfig/olat.properties 0 additions, 3 deletions

src/main/resources/serviceconfig/olat.properties

with 12 additions and 115 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