diff --git a/.gitmodules b/.gitmodules
index 1ba956e0..802b0cee 100644
--- a/.gitmodules
+++ b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d702156..e8f1ba7c 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/web/documentserver-example/csharp-mvc/assets/document-formats b/web/documentserver-example/csharp-mvc/assets/document-formats
index aff1285e..90de80c2 160000
--- a/web/documentserver-example/csharp-mvc/assets/document-formats
+++ b/web/documentserver-example/csharp-mvc/assets/document-formats
@@ -1 +1 @@
-Subproject commit aff1285e92c02b46225a501e94cba3a07bb6e6f3
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/csharp/assets/document-formats b/web/documentserver-example/csharp/assets/document-formats
index aff1285e..90de80c2 160000
--- a/web/documentserver-example/csharp/assets/document-formats
+++ b/web/documentserver-example/csharp/assets/document-formats
@@ -1 +1 @@
-Subproject commit aff1285e92c02b46225a501e94cba3a07bb6e6f3
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/go/static/assets/document-formats b/web/documentserver-example/go/static/assets/document-formats
index aff1285e..90de80c2 160000
--- a/web/documentserver-example/go/static/assets/document-formats
+++ b/web/documentserver-example/go/static/assets/document-formats
@@ -1 +1 @@
-Subproject commit aff1285e92c02b46225a501e94cba3a07bb6e6f3
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/java/src/main/resources/assets/document-formats b/web/documentserver-example/java/src/main/resources/assets/document-formats
index aff1285e..90de80c2 160000
--- a/web/documentserver-example/java/src/main/resources/assets/document-formats
+++ b/web/documentserver-example/java/src/main/resources/assets/document-formats
@@ -1 +1 @@
-Subproject commit aff1285e92c02b46225a501e94cba3a07bb6e6f3
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/nodejs/helpers/wopi/wopiRouting.js b/web/documentserver-example/nodejs/helpers/wopi/wopiRouting.js
index 7f9d2c4d..e7edcb42 100755
--- a/web/documentserver-example/nodejs/helpers/wopi/wopiRouting.js
+++ b/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);
diff --git a/web/documentserver-example/nodejs/public/assets/document-formats b/web/documentserver-example/nodejs/public/assets/document-formats
index 6597955e..90de80c2 160000
--- a/web/documentserver-example/nodejs/public/assets/document-formats
+++ b/web/documentserver-example/nodejs/public/assets/document-formats
@@ -1 +1 @@
-Subproject commit 6597955ee70c9238ed9a6a273c2d233309d090c2
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/nodejs/views/wopiAction.ejs b/web/documentserver-example/nodejs/views/wopiAction.ejs
index 7fa63d91..ceee93c2 100644
--- a/web/documentserver-example/nodejs/views/wopiAction.ejs
+++ b/web/documentserver-example/nodejs/views/wopiAction.ejs
@@ -23,7 +23,7 @@
*
-->
ONLYOFFICE Document Editors
-
+