Merge remote-tracking branch 'remotes/origin/develop' into feature/on-user-action-required

# Conflicts:
#	CHANGELOG.md

.gitmodules

@@ -5,7 +5,6 @@
 [submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
 	path = web/documentserver-example/nodejs/public/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = feature/v8.3
 [submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
 	path = web/documentserver-example/csharp-mvc/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
@@ -20,7 +19,6 @@
 [submodule "web/documentserver-example/php/assets/document-formats"]
 	path = web/documentserver-example/php/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/python/assets/document-templates"]
 	path = web/documentserver-example/python/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
@@ -44,15 +42,12 @@
 [submodule "web/documentserver-example/go/static/assets/document-formats"]
 	path = web/documentserver-example/go/static/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/python/assets/document-formats"]
 	path = web/documentserver-example/python/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/ruby/assets/document-formats"]
 	path = web/documentserver-example/ruby/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"]
 	path = web/documentserver-example/java/src/main/resources/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats

CHANGELOG.md

@@ -1,16 +1,6 @@
 # Change Log
 
-- ruby: onUserActionRequired
-- python: onUserActionRequired
-- php-laravel: onUserActionRequired
-- php: onUserActionRequired
-- java-spring: onUserActionRequired
-- java: onUserActionRequired
-- golang: onUserActionRequired
-- csharp-mvc: onUserActionRequired
-- csharp: onUserActionRequired
-- nodejs: onUserActionRequired
-- nodejs: support vsdx in diagram editor
+- nodejs: using faviconUrl from WOPI discovery
 - golang: new integration example
 - golang: upload files to the server
 - golang: create blank files and files with sample content
@@ -26,6 +16,9 @@
 - php-laravel: show forgotten files on a seperate page
 - php-laravel: fetch files
 - php-laravel: integrate sdk
+- onUserActionRequired
+- support pages, numbers, key formats
+- support hwp, hwpx formats
 - restore by url
 - refresh config
 - on uploading xml convert to supported type only

web/documentserver-example/nodejs/helpers/wopi/wopiRouting.js

@@ -146,6 +146,7 @@ exports.registerRoutes = function registerRoutes(app) {
         token: 'test',
         tokenTtl: Date.now() + 1000 * 60 * 60 * 10,
         params: getCustomWopiParams(req.query),
+        favIconUrl: action.favIconUrl,
       });
     } catch (ex) {
       console.log(ex);

web/documentserver-example/nodejs/views/wopiAction.ejs

@@ -23,7 +23,7 @@
     *
     -->
     <title>ONLYOFFICE Document Editors</title>
-    <link href="../images/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link href="<%= favIconUrl %>" rel="shortcut icon" type="image/x-icon" />
 
     <style type="text/css">
         body {