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

# 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
92 changed files with 740 additions and 556 deletions

View File

@ -512,6 +512,12 @@
config.events.onRequestSaveAs = onRequestSaveAs;
};
if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
&& DocsAPI.DocEditor.version().split(".")[0] < 7) {
innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
return;
}
docEditor = new DocsAPI.DocEditor("iframeEditor", config);
};