Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk (e509df0b) · 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

e509df0b

Commit e509df0b authored 4 years ago by Andreas Parschalk

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/OpenOLAT_15.3' into OpenOLAT_15.3.uibk

parents 7a715dbc 82db03a0

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/sysinfo/LargeFilesController.java 3 additions, 2 deletions

...ain/java/org/olat/admin/sysinfo/LargeFilesController.java
src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/OnlyOfficeModule.java 30 additions, 0 deletions

...mmons/services/doceditor/onlyoffice/OnlyOfficeModule.java
src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/manager/OnlyOfficeConversionServiceImpl.java 4 additions, 4 deletions

...r/onlyoffice/manager/OnlyOfficeConversionServiceImpl.java
src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/manager/OnlyOfficeHttpClientCreator.java 47 additions, 0 deletions

...ditor/onlyoffice/manager/OnlyOfficeHttpClientCreator.java
src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/manager/OnlyOfficeServiceImpl.java 3 additions, 2 deletions

...s/doceditor/onlyoffice/manager/OnlyOfficeServiceImpl.java
src/main/java/org/olat/core/util/StringHelper.java 4 additions, 0 deletions

src/main/java/org/olat/core/util/StringHelper.java
src/main/java/org/olat/modules/forms/ui/RubricBarChartsController.java 3 additions, 3 deletions

.../org/olat/modules/forms/ui/RubricBarChartsController.java
src/main/resources/serviceconfig/olat.properties 5 additions, 0 deletions

src/main/resources/serviceconfig/olat.properties

with 99 additions and 11 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