From e1409966bd0351f055fda32abfa101b4f892bedc Mon Sep 17 00:00:00 2001
From: sshakndr <aleksandr.kondratyev@onlyoffice.com>
Date: Thu, 6 Feb 2025 14:54:38 +0700
Subject: [PATCH 1/6] feat(nodejs): use favIconUrl in wopi

---
 web/documentserver-example/nodejs/helpers/wopi/wopiRouting.js | 1 +
 web/documentserver-example/nodejs/views/wopiAction.ejs        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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/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 @@
     *
     -->
     <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 {

From d4aaa384140fbb53aa3933929fd76e30df92ea78 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 6 Feb 2025 18:19:46 +0300
Subject: [PATCH 2/6] nodejs: update submodule

---
 .gitmodules                                                     | 1 -
 .../nodejs/public/assets/document-formats                       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ea9933b1..7d814d35 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
diff --git a/web/documentserver-example/nodejs/public/assets/document-formats b/web/documentserver-example/nodejs/public/assets/document-formats
index 0e0d8f2a..db08f048 160000
--- a/web/documentserver-example/nodejs/public/assets/document-formats
+++ b/web/documentserver-example/nodejs/public/assets/document-formats
@@ -1 +1 @@
-Subproject commit 0e0d8f2a354d09c85deb2514b5bfce3201934ba0
+Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5

From ed1759181a58c1f9091822ceff54126ebd34f70d Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 6 Feb 2025 18:24:39 +0300
Subject: [PATCH 3/6] update submodules

---
 CHANGELOG.md                                                    | 1 -
 web/documentserver-example/csharp-mvc/assets/document-formats   | 2 +-
 web/documentserver-example/csharp/assets/document-formats       | 2 +-
 web/documentserver-example/go/static/assets/document-formats    | 2 +-
 .../java/src/main/resources/assets/document-formats             | 2 +-
 web/documentserver-example/php/assets/document-formats          | 2 +-
 web/documentserver-example/python/assets/document-formats       | 2 +-
 web/documentserver-example/ruby/assets/document-formats         | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf445fdd..5c5c03d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,5 @@
 # Change Log
 
-- nodejs: support vsdx in diagram editor
 - golang: new integration example
 - golang: upload files to the server
 - golang: create blank files and files with sample content
diff --git a/web/documentserver-example/csharp-mvc/assets/document-formats b/web/documentserver-example/csharp-mvc/assets/document-formats
index aff1285e..db08f048 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 db08f048d98d5b72d654860a8e080b73f9a102e5
diff --git a/web/documentserver-example/csharp/assets/document-formats b/web/documentserver-example/csharp/assets/document-formats
index aff1285e..db08f048 160000
--- a/web/documentserver-example/csharp/assets/document-formats
+++ b/web/documentserver-example/csharp/assets/document-formats
@@ -1 +1 @@
-Subproject commit aff1285e92c02b46225a501e94cba3a07bb6e6f3
+Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
diff --git a/web/documentserver-example/go/static/assets/document-formats b/web/documentserver-example/go/static/assets/document-formats
index aff1285e..db08f048 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 db08f048d98d5b72d654860a8e080b73f9a102e5
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..db08f048 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 db08f048d98d5b72d654860a8e080b73f9a102e5
diff --git a/web/documentserver-example/php/assets/document-formats b/web/documentserver-example/php/assets/document-formats
index aff1285e..db08f048 160000
--- a/web/documentserver-example/php/assets/document-formats
+++ b/web/documentserver-example/php/assets/document-formats
@@ -1 +1 @@
-Subproject commit aff1285e92c02b46225a501e94cba3a07bb6e6f3
+Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
diff --git a/web/documentserver-example/python/assets/document-formats b/web/documentserver-example/python/assets/document-formats
index aff1285e..db08f048 160000
--- a/web/documentserver-example/python/assets/document-formats
+++ b/web/documentserver-example/python/assets/document-formats
@@ -1 +1 @@
-Subproject commit aff1285e92c02b46225a501e94cba3a07bb6e6f3
+Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
diff --git a/web/documentserver-example/ruby/assets/document-formats b/web/documentserver-example/ruby/assets/document-formats
index aff1285e..db08f048 160000
--- a/web/documentserver-example/ruby/assets/document-formats
+++ b/web/documentserver-example/ruby/assets/document-formats
@@ -1 +1 @@
-Subproject commit aff1285e92c02b46225a501e94cba3a07bb6e6f3
+Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5

From 13d5d38abc6cdec5fe6f25a05f53ca16a61355f5 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Fri, 7 Feb 2025 11:54:56 +0300
Subject: [PATCH 4/6] support hwp, hwpx, pages, numbers, key formats

---
 CHANGELOG.md                                                    | 2 ++
 web/documentserver-example/csharp-mvc/assets/document-formats   | 2 +-
 web/documentserver-example/csharp/assets/document-formats       | 2 +-
 web/documentserver-example/go/static/assets/document-formats    | 2 +-
 .../java/src/main/resources/assets/document-formats             | 2 +-
 .../nodejs/public/assets/document-formats                       | 2 +-
 web/documentserver-example/php/assets/document-formats          | 2 +-
 web/documentserver-example/python/assets/document-formats       | 2 +-
 web/documentserver-example/ruby/assets/document-formats         | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c5c03d7..363fe34d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@
 - php-laravel: show forgotten files on a seperate page
 - php-laravel: fetch files
 - php-laravel: integrate sdk
+- 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 db08f048..90de80c2 160000
--- a/web/documentserver-example/csharp-mvc/assets/document-formats
+++ b/web/documentserver-example/csharp-mvc/assets/document-formats
@@ -1 +1 @@
-Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/csharp/assets/document-formats b/web/documentserver-example/csharp/assets/document-formats
index db08f048..90de80c2 160000
--- a/web/documentserver-example/csharp/assets/document-formats
+++ b/web/documentserver-example/csharp/assets/document-formats
@@ -1 +1 @@
-Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/go/static/assets/document-formats b/web/documentserver-example/go/static/assets/document-formats
index db08f048..90de80c2 160000
--- a/web/documentserver-example/go/static/assets/document-formats
+++ b/web/documentserver-example/go/static/assets/document-formats
@@ -1 +1 @@
-Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
+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 db08f048..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 db08f048d98d5b72d654860a8e080b73f9a102e5
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/nodejs/public/assets/document-formats b/web/documentserver-example/nodejs/public/assets/document-formats
index db08f048..90de80c2 160000
--- a/web/documentserver-example/nodejs/public/assets/document-formats
+++ b/web/documentserver-example/nodejs/public/assets/document-formats
@@ -1 +1 @@
-Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/php/assets/document-formats b/web/documentserver-example/php/assets/document-formats
index db08f048..90de80c2 160000
--- a/web/documentserver-example/php/assets/document-formats
+++ b/web/documentserver-example/php/assets/document-formats
@@ -1 +1 @@
-Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/python/assets/document-formats b/web/documentserver-example/python/assets/document-formats
index db08f048..90de80c2 160000
--- a/web/documentserver-example/python/assets/document-formats
+++ b/web/documentserver-example/python/assets/document-formats
@@ -1 +1 @@
-Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b
diff --git a/web/documentserver-example/ruby/assets/document-formats b/web/documentserver-example/ruby/assets/document-formats
index db08f048..90de80c2 160000
--- a/web/documentserver-example/ruby/assets/document-formats
+++ b/web/documentserver-example/ruby/assets/document-formats
@@ -1 +1 @@
-Subproject commit db08f048d98d5b72d654860a8e080b73f9a102e5
+Subproject commit 90de80c237e3db36ba61f1cf974a73277f51fd9b

From 3301421663a47ef177ea2700ff14e0164f13a040 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Fri, 7 Feb 2025 12:29:54 +0300
Subject: [PATCH 5/6] clean file

---
 .gitmodules | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ecda13f5..802b0cee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,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
@@ -43,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

From 0f895e7b382142bfaed7a5adcfa3df8d7b8ed219 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Fri, 7 Feb 2025 12:40:17 +0300
Subject: [PATCH 6/6] nodejs: wopi favicon to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 363fe34d..b2b8ccec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Change Log
 
+- 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