pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder

Browse Source 
# Conflicts:
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/storage/LocalFileStorage.java
This commit is contained in:
Sergey Linnik
2021-12-13 15:38:37 +03:00
parent 95ea50210f 24cfd661ef
commit 828115e5b0
92 changed files with 740 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/documentserver-example/nodejs/app.js
View File

@ -101,9 +101,9 @@ app.get("/", function (req, res) { // define a handler for default page
res.render("index", { // render index template with the parameters specified
preloaderUrl: siteUrl + configServer.get('preloaderUrl'),
convertExts: configServer.get('convertedDocs').join(","),
editedExts: configServer.get('editedDocs').join(","),
fillExts: configServer.get("fillDocs").join(","),
convertExts: configServer.get('convertedDocs'),
editedExts: configServer.get('editedDocs'),
fillExts: configServer.get("fillDocs"),
storedFiles: docManager.getStoredFiles(),
params: docManager.getCustomParams(),
users: users,