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

web/documentserver-example/csharp/Default.aspx

@@ -68,7 +68,7 @@
                                                 <a class="try-editor slide" data-type="slide">Presentation</a>
                                             </li>
                                             <li>
-                                                <a class="try-editor form" data-type="docxf">Master form</a>
+                                                <a class="try-editor form" data-type="docxf">Form template</a>
                                             </li>
                                         </ul>
                                         <label class="create-sample">

web/documentserver-example/csharp/DocEditor.aspx

@@ -220,6 +220,12 @@
         };
 
         var сonnectEditor = function () {
+            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);
         };
 

web/documentserver-example/csharp/settings.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.0.0"/>
+  <add key="version" value="1.1.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>