From 766adeeb51dfcafec4dd4a88b6d8fbc25d2515b9 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 18 Dec 2023 17:27:20 +0300 Subject: [PATCH 01/25] nodejs: filling pdf --- .gitmodules | 2 +- CHANGELOG.md | 1 + .../nodejs/public/assets/document-formats | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 73469fd1..43b3007a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [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 = master + branch = feature/v8.0 [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/CHANGELOG.md b/CHANGELOG.md index 8dc64059..6efde99b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- nodejs: filling pdf - version number to page meta - ar skin languages - sr-Latn-CS skin languages diff --git a/web/documentserver-example/nodejs/public/assets/document-formats b/web/documentserver-example/nodejs/public/assets/document-formats index 2c3e099f..96468a84 160000 --- a/web/documentserver-example/nodejs/public/assets/document-formats +++ b/web/documentserver-example/nodejs/public/assets/document-formats @@ -1 +1 @@ -Subproject commit 2c3e099f1e8eaaf7070cdb81643de9586a2235e2 +Subproject commit 96468a84bf29a2805063e5cf34b9910b0c1a7699 From bc4c1dd87c8b13050caceefecfa22211a889a2c4 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 13 Nov 2023 18:40:43 +0300 Subject: [PATCH 02/25] nodejs: pdf as new documentType --- CHANGELOG.md | 1 + .../nodejs/helpers/fileUtility.js | 1 + .../nodejs/public/assets/document-formats | 2 +- .../nodejs/public/images/icon_pdf.svg | 1 + .../nodejs/public/images/pdf.ico | Bin 0 -> 9274 bytes .../nodejs/public/stylesheets/stylesheet.css | 5 +++++ 6 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 web/documentserver-example/nodejs/public/images/icon_pdf.svg create mode 100644 web/documentserver-example/nodejs/public/images/pdf.ico diff --git a/CHANGELOG.md b/CHANGELOG.md index 6efde99b..d05f7b43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- nodejs: pdf, djvu, xps, oxps as pdf documentType - nodejs: filling pdf - version number to page meta - ar skin languages diff --git a/web/documentserver-example/nodejs/helpers/fileUtility.js b/web/documentserver-example/nodejs/helpers/fileUtility.js index 5203545b..b058f812 100644 --- a/web/documentserver-example/nodejs/helpers/fileUtility.js +++ b/web/documentserver-example/nodejs/helpers/fileUtility.js @@ -64,6 +64,7 @@ fileUtility.fileType = { word: 'word', cell: 'cell', slide: 'slide', + pdf: 'pdf', }; fileUtility.getSuppotredExtensions = function getSuppotredExtensions() { diff --git a/web/documentserver-example/nodejs/public/assets/document-formats b/web/documentserver-example/nodejs/public/assets/document-formats index 96468a84..1471f3f0 160000 --- a/web/documentserver-example/nodejs/public/assets/document-formats +++ b/web/documentserver-example/nodejs/public/assets/document-formats @@ -1 +1 @@ -Subproject commit 96468a84bf29a2805063e5cf34b9910b0c1a7699 +Subproject commit 1471f3f02b1e80fa9d943f3d920c46d01154cf19 diff --git a/web/documentserver-example/nodejs/public/images/icon_pdf.svg b/web/documentserver-example/nodejs/public/images/icon_pdf.svg new file mode 100644 index 00000000..1867081a --- /dev/null +++ b/web/documentserver-example/nodejs/public/images/icon_pdf.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/documentserver-example/nodejs/public/images/pdf.ico b/web/documentserver-example/nodejs/public/images/pdf.ico new file mode 100644 index 0000000000000000000000000000000000000000..2cabc7281b6c9fca021951694b32199d9709bd8c GIT binary patch literal 9274 zcmZQzU<5*aeFh+@z@VbSz#zuJz@P!dKp}=WAO?wpK#LLsgR&k3g9U&@Xy_{D;NVpi zK|!nT0rCGKfbRtct}F++J1A&n)evwmMwmjw`~FaLJJ8K{hp4+T;$hSuLn6PA#@o;+ zmq+7iG@gb;8fa=d^ndZ0jd?AmqrKRp4+zEQWY`aga8ng7R*J*FE5*+;E# zA2nyRoimyShDI8Qj9mLaE^Y(SI3{L2&T=9;dL2P?K=x59ZID_wefjbWr`>n&z9U%8 z4P@Ok>UQenC*(A9w|YKRhkq3-^Ic@9WlG$C{Q)OLr6Hc53B8V$DGg_ffY~ zCoK~b_M_oWzpzG*59Dxv`t%dlcKpSQFNn&kp!`CpFF?)qJF?s14#dO2S4NK3tHh^2 zQpXAA&OMK{4gjUYNs~?y9B-iJI016nA7v9C=c8dY8djreU^ESkrUA0kz=I(gcK3ku f^3_Ar?W-%1) Date: Fri, 8 Dec 2023 17:43:29 +0300 Subject: [PATCH 03/25] nodejs: change submitForm status --- web/documentserver-example/nodejs/app.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 3a6a4d08..f9297527 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -994,7 +994,11 @@ app.get('/editor', (req, res) => { // define a handler for editing document if (!canEdit && mode === 'edit') { mode = 'view'; } - const submitForm = mode === 'fillForms' && userid === 'uid-1'; + + let submitForm = false; + if (mode === 'fillForms') { + submitForm = userid === 'uid-1'; + } // file config data const argss = { From 9f75edf22aeaa8d29bf70ceb8b4df5a132060954 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Wed, 17 Jan 2024 12:30:26 +0300 Subject: [PATCH 04/25] nodejs: pdf editor without creation (Fix Bug 64607 ) --- web/documentserver-example/nodejs/app.js | 27 ++++++++++--------- .../nodejs/helpers/docManager.js | 8 ++++-- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index f9297527..2eea3a9c 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -936,18 +936,21 @@ app.get('/editor', (req, res) => { // define a handler for editing document const templatesImageUrl = req.DocManager.getTemplateImageUrl(fileUtility.getFileType(fileName)); const createUrl = req.DocManager.getCreateUrl(fileUtility.getFileType(fileName), userid, type, lang); - const templates = [ - { - image: '', - title: 'Blank', - url: createUrl, - }, - { - image: templatesImageUrl, - title: 'With sample content', - url: `${createUrl}&sample=true`, - }, - ]; + let templates = null; + if (createUrl != null) { + templates = [ + { + image: '', + title: 'Blank', + url: createUrl, + }, + { + image: templatesImageUrl, + title: 'With sample content', + url: `${createUrl}&sample=true`, + }, + ]; + } const userGroup = user.group; const { reviewGroups } = user; diff --git a/web/documentserver-example/nodejs/helpers/docManager.js b/web/documentserver-example/nodejs/helpers/docManager.js index 3a67e477..0aae1be8 100644 --- a/web/documentserver-example/nodejs/helpers/docManager.js +++ b/web/documentserver-example/nodejs/helpers/docManager.js @@ -214,7 +214,11 @@ DocManager.prototype.getCallback = function getCallback(fileName) { // get url to the created file DocManager.prototype.getCreateUrl = function getCreateUrl(docType, userid, type, lang) { const server = this.getServerUrl(); - const ext = this.getInternalExtension(docType).replace('.', ''); + let ext = this.getInternalExtension(docType); + if (ext === null) { + return null; + } + ext = ext.replace('.', ''); const handler = `/editor?fileExt=${ext}&userid=${userid}&type=${type}&lang=${lang}`; return server + handler; @@ -381,7 +385,7 @@ DocManager.prototype.getInternalExtension = function getInternalExtension(fileTy return '.pptx'; } - return '.docx'; // the default value is .docx + return null; // the default value is null }; // get the template image url From f0d78925263afe92353a9a8d14b903c629cfd41b Mon Sep 17 00:00:00 2001 From: sshakndr Date: Fri, 19 Jan 2024 17:59:18 +0700 Subject: [PATCH 05/25] fix(php): correct ext substring --- web/documentserver-example/php/assets/js/jscript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/php/assets/js/jscript.js b/web/documentserver-example/php/assets/js/jscript.js index d6421043..64421b42 100644 --- a/web/documentserver-example/php/assets/js/jscript.js +++ b/web/documentserver-example/php/assets/js/jscript.js @@ -200,7 +200,7 @@ if (typeof jQuery != "undefined") { var fileName = jq("#hiddenFileName").val(); var posExt = fileName.lastIndexOf('.'); - posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : ''; + posExt = 0 <= posExt ? fileName.substring(posExt + 1).trim().toLowerCase() : ''; if (EditedExtList.indexOf(posExt) != -1 || FillFormsExtList.indexOf(posExt) != -1) { jq("#beginEdit").removeClass("disable"); From d692abda4b983ed920bf04aea820327768a31006 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Fri, 19 Jan 2024 18:08:02 +0700 Subject: [PATCH 06/25] fix(php): correct sendNotify agrument --- web/documentserver-example/php/templates/docEditor.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/php/templates/docEditor.tpl b/web/documentserver-example/php/templates/docEditor.tpl index 27937bee..c0c77c60 100644 --- a/web/documentserver-example/php/templates/docEditor.tpl +++ b/web/documentserver-example/php/templates/docEditor.tpl @@ -310,7 +310,7 @@ var onRequestSendNotify = function (event) { event.data.actionLink = replaceActionLink(location.href, JSON.stringify(event.data.actionLink)); var data = JSON.stringify(event.data); - innerAlert(\"onRequestSendNotify: \" + data); + innerAlert("onRequestSendNotify: " + data); }; var сonnectEditor = function () { From e85cb5137bfe524c6283fb3640014e041d77c894 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 23 Jan 2024 16:22:41 +0300 Subject: [PATCH 07/25] nodejs: fix serbian lang --- web/documentserver-example/nodejs/helpers/docManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/nodejs/helpers/docManager.js b/web/documentserver-example/nodejs/helpers/docManager.js index 3a67e477..6ab726d1 100644 --- a/web/documentserver-example/nodejs/helpers/docManager.js +++ b/web/documentserver-example/nodejs/helpers/docManager.js @@ -51,7 +51,7 @@ DocManager.prototype.createDirectory = function createDirectory(directory) { // get the language from the request DocManager.prototype.getLang = function getLang() { - if (/^[a-z]{2}(-[A-Z]{2})?$/i.test(this.req.query.lang)) { + if (/^[a-z]{2}(-[A-z]{4})?(-[A-Z]{2})?$/.test(this.req.query.lang)) { return this.req.query.lang; } // the default language value is English return 'en'; From 319a689fe23fac328b41894bc2f919037c0e30dd Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 18 Dec 2023 17:27:20 +0300 Subject: [PATCH 08/25] nodejs: filling pdf --- CHANGELOG.md | 1 + .../java-spring/src/main/resources/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 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dc64059..6efde99b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- nodejs: filling pdf - version number to page meta - ar skin languages - sr-Latn-CS skin languages diff --git a/web/documentserver-example/java-spring/src/main/resources/assets/document-formats b/web/documentserver-example/java-spring/src/main/resources/assets/document-formats index 2c3e099f..05bf7a6e 160000 --- a/web/documentserver-example/java-spring/src/main/resources/assets/document-formats +++ b/web/documentserver-example/java-spring/src/main/resources/assets/document-formats @@ -1 +1 @@ -Subproject commit 2c3e099f1e8eaaf7070cdb81643de9586a2235e2 +Subproject commit 05bf7a6e6d0a483a117a9853dc51bb517679677a 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 2c3e099f..05bf7a6e 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 2c3e099f1e8eaaf7070cdb81643de9586a2235e2 +Subproject commit 05bf7a6e6d0a483a117a9853dc51bb517679677a diff --git a/web/documentserver-example/nodejs/public/assets/document-formats b/web/documentserver-example/nodejs/public/assets/document-formats index 2c3e099f..05bf7a6e 160000 --- a/web/documentserver-example/nodejs/public/assets/document-formats +++ b/web/documentserver-example/nodejs/public/assets/document-formats @@ -1 +1 @@ -Subproject commit 2c3e099f1e8eaaf7070cdb81643de9586a2235e2 +Subproject commit 05bf7a6e6d0a483a117a9853dc51bb517679677a diff --git a/web/documentserver-example/php/assets/document-formats b/web/documentserver-example/php/assets/document-formats index 2c3e099f..05bf7a6e 160000 --- a/web/documentserver-example/php/assets/document-formats +++ b/web/documentserver-example/php/assets/document-formats @@ -1 +1 @@ -Subproject commit 2c3e099f1e8eaaf7070cdb81643de9586a2235e2 +Subproject commit 05bf7a6e6d0a483a117a9853dc51bb517679677a diff --git a/web/documentserver-example/python/assets/document-formats b/web/documentserver-example/python/assets/document-formats index 2c3e099f..05bf7a6e 160000 --- a/web/documentserver-example/python/assets/document-formats +++ b/web/documentserver-example/python/assets/document-formats @@ -1 +1 @@ -Subproject commit 2c3e099f1e8eaaf7070cdb81643de9586a2235e2 +Subproject commit 05bf7a6e6d0a483a117a9853dc51bb517679677a diff --git a/web/documentserver-example/ruby/assets/document-formats b/web/documentserver-example/ruby/assets/document-formats index 2c3e099f..05bf7a6e 160000 --- a/web/documentserver-example/ruby/assets/document-formats +++ b/web/documentserver-example/ruby/assets/document-formats @@ -1 +1 @@ -Subproject commit 2c3e099f1e8eaaf7070cdb81643de9586a2235e2 +Subproject commit 05bf7a6e6d0a483a117a9853dc51bb517679677a From c15438a0d7767f8d9b7dedb4417dd46e810ac53b Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 13 Nov 2023 18:40:43 +0300 Subject: [PATCH 09/25] nodejs: pdf as new documentType --- .gitmodules | 2 +- CHANGELOG.md | 1 + .../nodejs/helpers/fileUtility.js | 1 + .../nodejs/public/assets/document-formats | 2 +- .../nodejs/public/images/icon_pdf.svg | 1 + .../nodejs/public/images/pdf.ico | Bin 0 -> 9274 bytes .../nodejs/public/stylesheets/stylesheet.css | 5 +++++ 7 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 web/documentserver-example/nodejs/public/images/icon_pdf.svg create mode 100644 web/documentserver-example/nodejs/public/images/pdf.ico diff --git a/.gitmodules b/.gitmodules index 73469fd1..43b3007a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [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 = master + branch = feature/v8.0 [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/CHANGELOG.md b/CHANGELOG.md index 6efde99b..d05f7b43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- nodejs: pdf, djvu, xps, oxps as pdf documentType - nodejs: filling pdf - version number to page meta - ar skin languages diff --git a/web/documentserver-example/nodejs/helpers/fileUtility.js b/web/documentserver-example/nodejs/helpers/fileUtility.js index 5203545b..b058f812 100644 --- a/web/documentserver-example/nodejs/helpers/fileUtility.js +++ b/web/documentserver-example/nodejs/helpers/fileUtility.js @@ -64,6 +64,7 @@ fileUtility.fileType = { word: 'word', cell: 'cell', slide: 'slide', + pdf: 'pdf', }; fileUtility.getSuppotredExtensions = function getSuppotredExtensions() { diff --git a/web/documentserver-example/nodejs/public/assets/document-formats b/web/documentserver-example/nodejs/public/assets/document-formats index 05bf7a6e..d81437e6 160000 --- a/web/documentserver-example/nodejs/public/assets/document-formats +++ b/web/documentserver-example/nodejs/public/assets/document-formats @@ -1 +1 @@ -Subproject commit 05bf7a6e6d0a483a117a9853dc51bb517679677a +Subproject commit d81437e6d35d8d8fda23cee3e30312302046da33 diff --git a/web/documentserver-example/nodejs/public/images/icon_pdf.svg b/web/documentserver-example/nodejs/public/images/icon_pdf.svg new file mode 100644 index 00000000..1867081a --- /dev/null +++ b/web/documentserver-example/nodejs/public/images/icon_pdf.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/documentserver-example/nodejs/public/images/pdf.ico b/web/documentserver-example/nodejs/public/images/pdf.ico new file mode 100644 index 0000000000000000000000000000000000000000..2cabc7281b6c9fca021951694b32199d9709bd8c GIT binary patch literal 9274 zcmZQzU<5*aeFh+@z@VbSz#zuJz@P!dKp}=WAO?wpK#LLsgR&k3g9U&@Xy_{D;NVpi zK|!nT0rCGKfbRtct}F++J1A&n)evwmMwmjw`~FaLJJ8K{hp4+T;$hSuLn6PA#@o;+ zmq+7iG@gb;8fa=d^ndZ0jd?AmqrKRp4+zEQWY`aga8ng7R*J*FE5*+;E# zA2nyRoimyShDI8Qj9mLaE^Y(SI3{L2&T=9;dL2P?K=x59ZID_wefjbWr`>n&z9U%8 z4P@Ok>UQenC*(A9w|YKRhkq3-^Ic@9WlG$C{Q)OLr6Hc53B8V$DGg_ffY~ zCoK~b_M_oWzpzG*59Dxv`t%dlcKpSQFNn&kp!`CpFF?)qJF?s14#dO2S4NK3tHh^2 zQpXAA&OMK{4gjUYNs~?y9B-iJI016nA7v9C=c8dY8djreU^ESkrUA0kz=I(gcK3ku f^3_Ar?W-%1) Date: Wed, 17 Jan 2024 12:30:26 +0300 Subject: [PATCH 10/25] nodejs: pdf editor without creation (Fix Bug 64607 ) --- web/documentserver-example/nodejs/app.js | 27 ++++++++++--------- .../nodejs/helpers/docManager.js | 8 ++++-- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index f9297527..2eea3a9c 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -936,18 +936,21 @@ app.get('/editor', (req, res) => { // define a handler for editing document const templatesImageUrl = req.DocManager.getTemplateImageUrl(fileUtility.getFileType(fileName)); const createUrl = req.DocManager.getCreateUrl(fileUtility.getFileType(fileName), userid, type, lang); - const templates = [ - { - image: '', - title: 'Blank', - url: createUrl, - }, - { - image: templatesImageUrl, - title: 'With sample content', - url: `${createUrl}&sample=true`, - }, - ]; + let templates = null; + if (createUrl != null) { + templates = [ + { + image: '', + title: 'Blank', + url: createUrl, + }, + { + image: templatesImageUrl, + title: 'With sample content', + url: `${createUrl}&sample=true`, + }, + ]; + } const userGroup = user.group; const { reviewGroups } = user; diff --git a/web/documentserver-example/nodejs/helpers/docManager.js b/web/documentserver-example/nodejs/helpers/docManager.js index 3a67e477..0aae1be8 100644 --- a/web/documentserver-example/nodejs/helpers/docManager.js +++ b/web/documentserver-example/nodejs/helpers/docManager.js @@ -214,7 +214,11 @@ DocManager.prototype.getCallback = function getCallback(fileName) { // get url to the created file DocManager.prototype.getCreateUrl = function getCreateUrl(docType, userid, type, lang) { const server = this.getServerUrl(); - const ext = this.getInternalExtension(docType).replace('.', ''); + let ext = this.getInternalExtension(docType); + if (ext === null) { + return null; + } + ext = ext.replace('.', ''); const handler = `/editor?fileExt=${ext}&userid=${userid}&type=${type}&lang=${lang}`; return server + handler; @@ -381,7 +385,7 @@ DocManager.prototype.getInternalExtension = function getInternalExtension(fileTy return '.pptx'; } - return '.docx'; // the default value is .docx + return null; // the default value is null }; // get the template image url From 0bcd7088e6180b0a6326f91a8bb27a30ac730860 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 30 Jan 2024 18:11:47 +0300 Subject: [PATCH 11/25] 1.8.0 --- CHANGELOG.md | 1 + web/documentserver-example/csharp-mvc/web.appsettings.config | 2 +- web/documentserver-example/csharp/settings.config | 2 +- .../java-spring/src/main/resources/application.properties | 2 +- .../java/src/main/resources/settings.properties | 2 +- web/documentserver-example/nodejs/config/default.json | 2 +- .../php/src/configuration/ConfigurationManager.php | 2 +- .../python/src/configuration/configuration.py | 2 +- .../ruby/app/configuration/configuration.rb | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d05f7b43..79fe928a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +## 1.8.0 - nodejs: pdf, djvu, xps, oxps as pdf documentType - nodejs: filling pdf - version number to page meta diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config index 1c9d886f..d7b27dba 100644 --- a/web/documentserver-example/csharp-mvc/web.appsettings.config +++ b/web/documentserver-example/csharp-mvc/web.appsettings.config @@ -1,7 +1,7 @@ - + diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index dcd2ee96..7cbdfa66 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -1,7 +1,7 @@ - + diff --git a/web/documentserver-example/java-spring/src/main/resources/application.properties b/web/documentserver-example/java-spring/src/main/resources/application.properties index 2029edbf..1c4be58d 100755 --- a/web/documentserver-example/java-spring/src/main/resources/application.properties +++ b/web/documentserver-example/java-spring/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.version=1.7.0 +server.version=1.8.0 server.address= server.port=4000 diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties index 0dd82042..887aad31 100644 --- a/web/documentserver-example/java/src/main/resources/settings.properties +++ b/web/documentserver-example/java/src/main/resources/settings.properties @@ -1,4 +1,4 @@ -version=1.7.0 +version=1.8.0 filesize-max=5242880 storage-folder=app_data diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json index edf6c07c..0fe19dcb 100644 --- a/web/documentserver-example/nodejs/config/default.json +++ b/web/documentserver-example/nodejs/config/default.json @@ -1,5 +1,5 @@ { - "version": "1.7.0", + "version": "1.8.0", "log": { "appenders": [ { diff --git a/web/documentserver-example/php/src/configuration/ConfigurationManager.php b/web/documentserver-example/php/src/configuration/ConfigurationManager.php index 2f13745c..d03b1b8e 100644 --- a/web/documentserver-example/php/src/configuration/ConfigurationManager.php +++ b/web/documentserver-example/php/src/configuration/ConfigurationManager.php @@ -22,7 +22,7 @@ use Example\Common\URL; class ConfigurationManager { - public string $version = '1.7.0'; + public string $version = '1.8.0'; public function getVersion(): string { diff --git a/web/documentserver-example/python/src/configuration/configuration.py b/web/documentserver-example/python/src/configuration/configuration.py index ee04d898..3969059f 100644 --- a/web/documentserver-example/python/src/configuration/configuration.py +++ b/web/documentserver-example/python/src/configuration/configuration.py @@ -22,7 +22,7 @@ from src.common import string class ConfigurationManager: - version = '1.7.0' + version = '1.8.0' def getVersion(self) -> str: return self.version diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index 23857442..6ac9bac0 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -31,7 +31,7 @@ class ConfigurationManager sig { void } def initialize - @version = '1.7.0' + @version = '1.8.0' end sig { returns(T.nilable(URI::Generic)) } From dab4841c1decddebcecb81e9dd6673f90b6104fd Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Thu, 1 Feb 2024 12:35:46 +0300 Subject: [PATCH 12/25] inserting svg --- CHANGELOG.md | 1 + .../csharp-mvc/Content/images/logo.png | Bin 2069 -> 0 bytes .../csharp-mvc/Models/FileModel.cs | 6 +++--- .../csharp-mvc/OnlineEditorsExampleMVC.csproj | 1 - .../csharp/App_Themes/images/logo.png | Bin 2069 -> 0 bytes .../csharp/DocEditor.aspx.cs | 6 +++--- .../csharp/OnlineEditorsExample.csproj | 1 - .../controllers/EditorController.java | 6 +++--- .../src/main/resources/static/css/img/logo.png | Bin 2069 -> 0 bytes .../src/main/java/controllers/EditorServlet.java | 6 +++--- .../java/src/main/webapp/css/img/logo.png | Bin 2069 -> 0 bytes web/documentserver-example/nodejs/app.js | 6 +++--- .../nodejs/public/images/logo.png | Bin 2069 -> 0 bytes .../php/assets/images/logo.png | Bin 2069 -> 0 bytes .../php/src/views/DocEditorView.php | 10 +++++----- .../python/src/views/actions.py | 10 +++++----- .../python/static/images/logo.png | Bin 2069 -> 0 bytes .../ruby/app/assets/images/logo.png | Bin 2069 -> 0 bytes .../ruby/app/models/file_model.rb | 10 +++++----- 19 files changed, 31 insertions(+), 32 deletions(-) delete mode 100644 web/documentserver-example/csharp-mvc/Content/images/logo.png delete mode 100644 web/documentserver-example/csharp/App_Themes/images/logo.png delete mode 100755 web/documentserver-example/java-spring/src/main/resources/static/css/img/logo.png delete mode 100644 web/documentserver-example/java/src/main/webapp/css/img/logo.png delete mode 100644 web/documentserver-example/nodejs/public/images/logo.png delete mode 100644 web/documentserver-example/php/assets/images/logo.png delete mode 100644 web/documentserver-example/python/static/images/logo.png delete mode 100644 web/documentserver-example/ruby/app/assets/images/logo.png diff --git a/CHANGELOG.md b/CHANGELOG.md index bf535168..1b7537f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- change insert image - nodejs: handling conversion -9 error - different goback for users - nodejs: converting function on index page diff --git a/web/documentserver-example/csharp-mvc/Content/images/logo.png b/web/documentserver-example/csharp-mvc/Content/images/logo.png deleted file mode 100644 index d433d89e2ea58b43a6e9903a830c65177e7e28c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2069 zcma)7i8mVv6OT%0qmCkVrLET8Rld59R^x~yDp^P9T2fVt*rkrDGbq~C5Q18&@`+N4 zR1Xn8N0gHCp;V}bAnFX2qK;h=KK=fJo%en-?>95=&6_v#W*)j=5Yk{(FaQ9MMj;*C z4lVfyj!GQrMaM5qhvrx~(klu8IH~mmVkkGwwL_;^lpDehQ1=1KKP12)TeK|z@H$6o z&kqCuNYD3GO0?69v()fb4ch#VJ>yQL{} z$Cl|>s8@N-wLG0y;t*g2s+5{g%X9P9JxhxDYaomfF^M}^u`;d~ijW0d6OX)sn4qNZ zPuAtd4r~7tDS8ilnK(-D)N+f?X_JQg5hSrW}X2yHwgJk zzIvk(|GCHyNCC^0jP)4KWE4#pd_sKy_H68G8wQbjm4r#Fzm`I85K^4vOI*b)hl}WD zuyvNU>0CDVX=Hsfk6{3V*WQlQB%vDoy*onTDVrvy)B>ySa&*BBXsv2K>#*DXHZ$H@ zP@LD!C9Y-}ou(ohc5*g- zFiw-2Ks=Z`R{L6O>r1iWSoZPyFqMPo9j~-6w-WF3AXHn^jppgF*Ax=8G&sxwQtAg}6@TU(eX8?`awX|eV$Bn{m--4XC+kG} ztjO(F-nQAQwe=(1GaS|EaH3~gG)uNBSHel+ zsaFPxR`|ql&(_%mSoKK-oqId>aLPo(yVI6$cLC3UI;7;M!8)q~Q;+Z!{D1wo+1a>D zOG$4W>0B3Rm^3H|n=>!*_ubi{<)~p#30;+8R77T=usdj~O)1(X)Q4a^KkzRn&tQ7! zZ)6(Sg+;c>>Ca>qu>v;tsBN^yCGNMRno>)XzFGg_01QXl>x4Q^+4o!+T6uW!1c={G zmKk2Is8T{zqpHxKqPX;t1q;8fVUBpWITC0C zYg-w_cPPa>EKJsxVjUGf-NNo7nNIOkAE-{NZ z6^k@)zvv_BRS#yz7$I6#1469NQS0r!8$*&SPnQje)CRrBTQhdGGl^4Y9IY89sxMZ= z`6uvlFS4^hs3cU);2fx#Wg&Ed+b}{5Oq@Iu^lL9~pmQwBX{!zhcW?SB+h>=jih+x` zU-8qlE!w4pnXc=f(**J5&bGux+n#o4-PZ}#l63c$bytd}?M=ksf%8pog0ZyDpg6}x zXTHDs)L(v>GrDTvVej7&MKg9kHmC%-=elcTxYQ)DqhKHLG)sa56nW zH^5$+sXx1{Hd^D9z{4h0zP}uqWh_QCh*UOvSYV@3A-rfyKej^o8YLW<$^emid(wH> zxuB5V!HRZ-$QY%OPhjq3j{ec}!0Qb45wBwXp|79<)a%f3%Jf{p*gCR-t(si373Yy^ z6n5Y|4V^Fm_KpMKN|phW2b_wpysSL+YRov6npQDgwA5`|Gjznc=62=L56@xW_7zIM zR!&0AUKzlmeCAC2t5WyW@)I4PyVpAVC?9#pNmNqfUi{;78tM}e*$`$jck+V}o$6n8 zgfN1=^44#PHP_V{yD?%dtCBlXcLCJ64&Xx|)z9Ep7BK(6OZo1UN1VT&L@iVP$U7T7luLgEp&IF;`+>;{47ZcixtumDK`V`F`D840**Xuu4`enM`&atb|lnrly z!0(K>l;3j}b8I~KH1$a(xo>aV(I0JQWCn<#o&L9WjMT3=Xmea$A^O?%4ufJZn|dn?2U_O2ho z6^xm)brVzMkZ-bie5mMbDh4x@yW2k>Y&WVDKh&7W7@%f3&>h?IRffon27Qaf_cfASN5I69;9WWe^3-0<4|XJBlUk6waP*O diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs index 1b0fae6a..a73adb5f 100755 --- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs @@ -291,20 +291,20 @@ namespace OnlineEditorsExampleMVC.Models { Path = HttpRuntime.AppDomainAppVirtualPath + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/") - + "Content\\images\\logo.png" + + "Content\\images\\logo.svg" }; var directMailMergeUrl = new UriBuilder(DocManagerHelper.GetServerUrl(false)) { Path = HttpRuntime.AppDomainAppVirtualPath + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/") - + "Content\\images\\logo.png" + + "Content\\images\\logo.svg" }; // create a logo config var logoConfig = new Dictionary { - { "fileType", "png"}, + { "fileType", "svg"}, { "url", mailMergeUrl.ToString()} }; diff --git a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj index e9e88433..d8b4bf0a 100644 --- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj +++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj @@ -145,7 +145,6 @@ - diff --git a/web/documentserver-example/csharp/App_Themes/images/logo.png b/web/documentserver-example/csharp/App_Themes/images/logo.png deleted file mode 100644 index d433d89e2ea58b43a6e9903a830c65177e7e28c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2069 zcma)7i8mVv6OT%0qmCkVrLET8Rld59R^x~yDp^P9T2fVt*rkrDGbq~C5Q18&@`+N4 zR1Xn8N0gHCp;V}bAnFX2qK;h=KK=fJo%en-?>95=&6_v#W*)j=5Yk{(FaQ9MMj;*C z4lVfyj!GQrMaM5qhvrx~(klu8IH~mmVkkGwwL_;^lpDehQ1=1KKP12)TeK|z@H$6o z&kqCuNYD3GO0?69v()fb4ch#VJ>yQL{} z$Cl|>s8@N-wLG0y;t*g2s+5{g%X9P9JxhxDYaomfF^M}^u`;d~ijW0d6OX)sn4qNZ zPuAtd4r~7tDS8ilnK(-D)N+f?X_JQg5hSrW}X2yHwgJk zzIvk(|GCHyNCC^0jP)4KWE4#pd_sKy_H68G8wQbjm4r#Fzm`I85K^4vOI*b)hl}WD zuyvNU>0CDVX=Hsfk6{3V*WQlQB%vDoy*onTDVrvy)B>ySa&*BBXsv2K>#*DXHZ$H@ zP@LD!C9Y-}ou(ohc5*g- zFiw-2Ks=Z`R{L6O>r1iWSoZPyFqMPo9j~-6w-WF3AXHn^jppgF*Ax=8G&sxwQtAg}6@TU(eX8?`awX|eV$Bn{m--4XC+kG} ztjO(F-nQAQwe=(1GaS|EaH3~gG)uNBSHel+ zsaFPxR`|ql&(_%mSoKK-oqId>aLPo(yVI6$cLC3UI;7;M!8)q~Q;+Z!{D1wo+1a>D zOG$4W>0B3Rm^3H|n=>!*_ubi{<)~p#30;+8R77T=usdj~O)1(X)Q4a^KkzRn&tQ7! zZ)6(Sg+;c>>Ca>qu>v;tsBN^yCGNMRno>)XzFGg_01QXl>x4Q^+4o!+T6uW!1c={G zmKk2Is8T{zqpHxKqPX;t1q;8fVUBpWITC0C zYg-w_cPPa>EKJsxVjUGf-NNo7nNIOkAE-{NZ z6^k@)zvv_BRS#yz7$I6#1469NQS0r!8$*&SPnQje)CRrBTQhdGGl^4Y9IY89sxMZ= z`6uvlFS4^hs3cU);2fx#Wg&Ed+b}{5Oq@Iu^lL9~pmQwBX{!zhcW?SB+h>=jih+x` zU-8qlE!w4pnXc=f(**J5&bGux+n#o4-PZ}#l63c$bytd}?M=ksf%8pog0ZyDpg6}x zXTHDs)L(v>GrDTvVej7&MKg9kHmC%-=elcTxYQ)DqhKHLG)sa56nW zH^5$+sXx1{Hd^D9z{4h0zP}uqWh_QCh*UOvSYV@3A-rfyKej^o8YLW<$^emid(wH> zxuB5V!HRZ-$QY%OPhjq3j{ec}!0Qb45wBwXp|79<)a%f3%Jf{p*gCR-t(si373Yy^ z6n5Y|4V^Fm_KpMKN|phW2b_wpysSL+YRov6npQDgwA5`|Gjznc=62=L56@xW_7zIM zR!&0AUKzlmeCAC2t5WyW@)I4PyVpAVC?9#pNmNqfUi{;78tM}e*$`$jck+V}o$6n8 zgfN1=^44#PHP_V{yD?%dtCBlXcLCJ64&Xx|)z9Ep7BK(6OZo1UN1VT&L@iVP$U7T7luLgEp&IF;`+>;{47ZcixtumDK`V`F`D840**Xuu4`enM`&atb|lnrly z!0(K>l;3j}b8I~KH1$a(xo>aV(I0JQWCn<#o&L9WjMT3=Xmea$A^O?%4ufJZn|dn?2U_O2ho z6^xm)brVzMkZ-bie5mMbDh4x@yW2k>Y&WVDKh&7W7@%f3&>h?IRffon27Qaf_cfASN5I69;9WWe^3-0<4|XJBlUk6waP*O diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs index c7106fe2..5bf65c90 100755 --- a/web/documentserver-example/csharp/DocEditor.aspx.cs +++ b/web/documentserver-example/csharp/DocEditor.aspx.cs @@ -340,17 +340,17 @@ namespace OnlineEditorsExample var InsertImageUrl = new UriBuilder(_Default.GetServerUrl(true)); InsertImageUrl.Path = HttpRuntime.AppDomainAppVirtualPath + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/") - + "App_Themes\\images\\logo.png"; + + "App_Themes\\images\\logo.svg"; var DirectImageUrl = new UriBuilder(_Default.GetServerUrl(false)); DirectImageUrl.Path = HttpRuntime.AppDomainAppVirtualPath + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/") - + "App_Themes\\images\\logo.png"; + + "App_Themes\\images\\logo.svg"; // create a logo config Dictionary logoConfig = new Dictionary { - { "fileType", "png"}, + { "fileType", "svg"}, { "url", InsertImageUrl.ToString()} }; diff --git a/web/documentserver-example/csharp/OnlineEditorsExample.csproj b/web/documentserver-example/csharp/OnlineEditorsExample.csproj index 2206a469..ada0f7e9 100644 --- a/web/documentserver-example/csharp/OnlineEditorsExample.csproj +++ b/web/documentserver-example/csharp/OnlineEditorsExample.csproj @@ -145,7 +145,6 @@ - diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java index e370169b..dd030aaf 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java @@ -212,11 +212,11 @@ public class EditorController { @SneakyThrows private String getInsertImage(final Boolean directUrl) { // get an image that will be inserted into the document Map dataInsertImage = new HashMap<>(); - dataInsertImage.put("fileType", "png"); - dataInsertImage.put("url", storagePathBuilder.getServerUrl(true) + "/css/img/logo.png"); + dataInsertImage.put("fileType", "svg"); + dataInsertImage.put("url", storagePathBuilder.getServerUrl(true) + "/css/img/logo.svg"); if (directUrl) { dataInsertImage.put("directUrl", storagePathBuilder - .getServerUrl(false) + "/css/img/logo.png"); + .getServerUrl(false) + "/css/img/logo.svg"); } // check if the document token is enabled diff --git a/web/documentserver-example/java-spring/src/main/resources/static/css/img/logo.png b/web/documentserver-example/java-spring/src/main/resources/static/css/img/logo.png deleted file mode 100755 index d433d89e2ea58b43a6e9903a830c65177e7e28c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2069 zcma)7i8mVv6OT%0qmCkVrLET8Rld59R^x~yDp^P9T2fVt*rkrDGbq~C5Q18&@`+N4 zR1Xn8N0gHCp;V}bAnFX2qK;h=KK=fJo%en-?>95=&6_v#W*)j=5Yk{(FaQ9MMj;*C z4lVfyj!GQrMaM5qhvrx~(klu8IH~mmVkkGwwL_;^lpDehQ1=1KKP12)TeK|z@H$6o z&kqCuNYD3GO0?69v()fb4ch#VJ>yQL{} z$Cl|>s8@N-wLG0y;t*g2s+5{g%X9P9JxhxDYaomfF^M}^u`;d~ijW0d6OX)sn4qNZ zPuAtd4r~7tDS8ilnK(-D)N+f?X_JQg5hSrW}X2yHwgJk zzIvk(|GCHyNCC^0jP)4KWE4#pd_sKy_H68G8wQbjm4r#Fzm`I85K^4vOI*b)hl}WD zuyvNU>0CDVX=Hsfk6{3V*WQlQB%vDoy*onTDVrvy)B>ySa&*BBXsv2K>#*DXHZ$H@ zP@LD!C9Y-}ou(ohc5*g- zFiw-2Ks=Z`R{L6O>r1iWSoZPyFqMPo9j~-6w-WF3AXHn^jppgF*Ax=8G&sxwQtAg}6@TU(eX8?`awX|eV$Bn{m--4XC+kG} ztjO(F-nQAQwe=(1GaS|EaH3~gG)uNBSHel+ zsaFPxR`|ql&(_%mSoKK-oqId>aLPo(yVI6$cLC3UI;7;M!8)q~Q;+Z!{D1wo+1a>D zOG$4W>0B3Rm^3H|n=>!*_ubi{<)~p#30;+8R77T=usdj~O)1(X)Q4a^KkzRn&tQ7! zZ)6(Sg+;c>>Ca>qu>v;tsBN^yCGNMRno>)XzFGg_01QXl>x4Q^+4o!+T6uW!1c={G zmKk2Is8T{zqpHxKqPX;t1q;8fVUBpWITC0C zYg-w_cPPa>EKJsxVjUGf-NNo7nNIOkAE-{NZ z6^k@)zvv_BRS#yz7$I6#1469NQS0r!8$*&SPnQje)CRrBTQhdGGl^4Y9IY89sxMZ= z`6uvlFS4^hs3cU);2fx#Wg&Ed+b}{5Oq@Iu^lL9~pmQwBX{!zhcW?SB+h>=jih+x` zU-8qlE!w4pnXc=f(**J5&bGux+n#o4-PZ}#l63c$bytd}?M=ksf%8pog0ZyDpg6}x zXTHDs)L(v>GrDTvVej7&MKg9kHmC%-=elcTxYQ)DqhKHLG)sa56nW zH^5$+sXx1{Hd^D9z{4h0zP}uqWh_QCh*UOvSYV@3A-rfyKej^o8YLW<$^emid(wH> zxuB5V!HRZ-$QY%OPhjq3j{ec}!0Qb45wBwXp|79<)a%f3%Jf{p*gCR-t(si373Yy^ z6n5Y|4V^Fm_KpMKN|phW2b_wpysSL+YRov6npQDgwA5`|Gjznc=62=L56@xW_7zIM zR!&0AUKzlmeCAC2t5WyW@)I4PyVpAVC?9#pNmNqfUi{;78tM}e*$`$jck+V}o$6n8 zgfN1=^44#PHP_V{yD?%dtCBlXcLCJ64&Xx|)z9Ep7BK(6OZo1UN1VT&L@iVP$U7T7luLgEp&IF;`+>;{47ZcixtumDK`V`F`D840**Xuu4`enM`&atb|lnrly z!0(K>l;3j}b8I~KH1$a(xo>aV(I0JQWCn<#o&L9WjMT3=Xmea$A^O?%4ufJZn|dn?2U_O2ho z6^xm)brVzMkZ-bie5mMbDh4x@yW2k>Y&WVDKh&7W7@%f3&>h?IRffon27Qaf_cfASN5I69;9WWe^3-0<4|XJBlUk6waP*O diff --git a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java index 49f62162..a124443f 100644 --- a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java @@ -78,10 +78,10 @@ public class EditorServlet extends HttpServlet { // an image that will be inserted into the document Map dataInsertImage = new HashMap<>(); - dataInsertImage.put("fileType", "png"); - dataInsertImage.put("url", DocumentManager.getServerUrl(true) + "/css/img/logo.png"); + dataInsertImage.put("fileType", "svg"); + dataInsertImage.put("url", DocumentManager.getServerUrl(true) + "/css/img/logo.svg"); if (isEnableDirectUrl) { - dataInsertImage.put("directUrl", DocumentManager.getServerUrl(false) + "/css/img/logo.png"); + dataInsertImage.put("directUrl", DocumentManager.getServerUrl(false) + "/css/img/logo.svg"); } // a document that will be compared with the current document diff --git a/web/documentserver-example/java/src/main/webapp/css/img/logo.png b/web/documentserver-example/java/src/main/webapp/css/img/logo.png deleted file mode 100644 index d433d89e2ea58b43a6e9903a830c65177e7e28c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2069 zcma)7i8mVv6OT%0qmCkVrLET8Rld59R^x~yDp^P9T2fVt*rkrDGbq~C5Q18&@`+N4 zR1Xn8N0gHCp;V}bAnFX2qK;h=KK=fJo%en-?>95=&6_v#W*)j=5Yk{(FaQ9MMj;*C z4lVfyj!GQrMaM5qhvrx~(klu8IH~mmVkkGwwL_;^lpDehQ1=1KKP12)TeK|z@H$6o z&kqCuNYD3GO0?69v()fb4ch#VJ>yQL{} z$Cl|>s8@N-wLG0y;t*g2s+5{g%X9P9JxhxDYaomfF^M}^u`;d~ijW0d6OX)sn4qNZ zPuAtd4r~7tDS8ilnK(-D)N+f?X_JQg5hSrW}X2yHwgJk zzIvk(|GCHyNCC^0jP)4KWE4#pd_sKy_H68G8wQbjm4r#Fzm`I85K^4vOI*b)hl}WD zuyvNU>0CDVX=Hsfk6{3V*WQlQB%vDoy*onTDVrvy)B>ySa&*BBXsv2K>#*DXHZ$H@ zP@LD!C9Y-}ou(ohc5*g- zFiw-2Ks=Z`R{L6O>r1iWSoZPyFqMPo9j~-6w-WF3AXHn^jppgF*Ax=8G&sxwQtAg}6@TU(eX8?`awX|eV$Bn{m--4XC+kG} ztjO(F-nQAQwe=(1GaS|EaH3~gG)uNBSHel+ zsaFPxR`|ql&(_%mSoKK-oqId>aLPo(yVI6$cLC3UI;7;M!8)q~Q;+Z!{D1wo+1a>D zOG$4W>0B3Rm^3H|n=>!*_ubi{<)~p#30;+8R77T=usdj~O)1(X)Q4a^KkzRn&tQ7! zZ)6(Sg+;c>>Ca>qu>v;tsBN^yCGNMRno>)XzFGg_01QXl>x4Q^+4o!+T6uW!1c={G zmKk2Is8T{zqpHxKqPX;t1q;8fVUBpWITC0C zYg-w_cPPa>EKJsxVjUGf-NNo7nNIOkAE-{NZ z6^k@)zvv_BRS#yz7$I6#1469NQS0r!8$*&SPnQje)CRrBTQhdGGl^4Y9IY89sxMZ= z`6uvlFS4^hs3cU);2fx#Wg&Ed+b}{5Oq@Iu^lL9~pmQwBX{!zhcW?SB+h>=jih+x` zU-8qlE!w4pnXc=f(**J5&bGux+n#o4-PZ}#l63c$bytd}?M=ksf%8pog0ZyDpg6}x zXTHDs)L(v>GrDTvVej7&MKg9kHmC%-=elcTxYQ)DqhKHLG)sa56nW zH^5$+sXx1{Hd^D9z{4h0zP}uqWh_QCh*UOvSYV@3A-rfyKej^o8YLW<$^emid(wH> zxuB5V!HRZ-$QY%OPhjq3j{ec}!0Qb45wBwXp|79<)a%f3%Jf{p*gCR-t(si373Yy^ z6n5Y|4V^Fm_KpMKN|phW2b_wpysSL+YRov6npQDgwA5`|Gjznc=62=L56@xW_7zIM zR!&0AUKzlmeCAC2t5WyW@)I4PyVpAVC?9#pNmNqfUi{;78tM}e*$`$jck+V}o$6n8 zgfN1=^44#PHP_V{yD?%dtCBlXcLCJ64&Xx|)z9Ep7BK(6OZo1UN1VT&L@iVP$U7T7luLgEp&IF;`+>;{47ZcixtumDK`V`F`D840**Xuu4`enM`&atb|lnrly z!0(K>l;3j}b8I~KH1$a(xo>aV(I0JQWCn<#o&L9WjMT3=Xmea$A^O?%4ufJZn|dn?2U_O2ho z6^xm)brVzMkZ-bie5mMbDh4x@yW2k>Y&WVDKh&7W7@%f3&>h?IRffon27Qaf_cfASN5I69;9WWe^3-0<4|XJBlUk6waP*O diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 1e66c792..c3273ff0 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -1074,9 +1074,9 @@ app.get('/editor', (req, res) => { // define a handler for editing document goback: user.goback != null ? user.goback : '', }, dataInsertImage: { - fileType: 'png', - url: `${req.DocManager.getServerUrl(true)}/images/logo.png`, - directUrl: !userDirectUrl ? null : `${req.DocManager.getServerUrl()}/images/logo.png`, + fileType: 'svg', + url: `${req.DocManager.getServerUrl(true)}/images/logo.svg`, + directUrl: !userDirectUrl ? null : `${req.DocManager.getServerUrl()}/images/logo.svg`, }, dataDocument: { fileType: 'docx', diff --git a/web/documentserver-example/nodejs/public/images/logo.png b/web/documentserver-example/nodejs/public/images/logo.png deleted file mode 100644 index d433d89e2ea58b43a6e9903a830c65177e7e28c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2069 zcma)7i8mVv6OT%0qmCkVrLET8Rld59R^x~yDp^P9T2fVt*rkrDGbq~C5Q18&@`+N4 zR1Xn8N0gHCp;V}bAnFX2qK;h=KK=fJo%en-?>95=&6_v#W*)j=5Yk{(FaQ9MMj;*C z4lVfyj!GQrMaM5qhvrx~(klu8IH~mmVkkGwwL_;^lpDehQ1=1KKP12)TeK|z@H$6o z&kqCuNYD3GO0?69v()fb4ch#VJ>yQL{} z$Cl|>s8@N-wLG0y;t*g2s+5{g%X9P9JxhxDYaomfF^M}^u`;d~ijW0d6OX)sn4qNZ zPuAtd4r~7tDS8ilnK(-D)N+f?X_JQg5hSrW}X2yHwgJk zzIvk(|GCHyNCC^0jP)4KWE4#pd_sKy_H68G8wQbjm4r#Fzm`I85K^4vOI*b)hl}WD zuyvNU>0CDVX=Hsfk6{3V*WQlQB%vDoy*onTDVrvy)B>ySa&*BBXsv2K>#*DXHZ$H@ zP@LD!C9Y-}ou(ohc5*g- zFiw-2Ks=Z`R{L6O>r1iWSoZPyFqMPo9j~-6w-WF3AXHn^jppgF*Ax=8G&sxwQtAg}6@TU(eX8?`awX|eV$Bn{m--4XC+kG} ztjO(F-nQAQwe=(1GaS|EaH3~gG)uNBSHel+ zsaFPxR`|ql&(_%mSoKK-oqId>aLPo(yVI6$cLC3UI;7;M!8)q~Q;+Z!{D1wo+1a>D zOG$4W>0B3Rm^3H|n=>!*_ubi{<)~p#30;+8R77T=usdj~O)1(X)Q4a^KkzRn&tQ7! zZ)6(Sg+;c>>Ca>qu>v;tsBN^yCGNMRno>)XzFGg_01QXl>x4Q^+4o!+T6uW!1c={G zmKk2Is8T{zqpHxKqPX;t1q;8fVUBpWITC0C zYg-w_cPPa>EKJsxVjUGf-NNo7nNIOkAE-{NZ z6^k@)zvv_BRS#yz7$I6#1469NQS0r!8$*&SPnQje)CRrBTQhdGGl^4Y9IY89sxMZ= z`6uvlFS4^hs3cU);2fx#Wg&Ed+b}{5Oq@Iu^lL9~pmQwBX{!zhcW?SB+h>=jih+x` zU-8qlE!w4pnXc=f(**J5&bGux+n#o4-PZ}#l63c$bytd}?M=ksf%8pog0ZyDpg6}x zXTHDs)L(v>GrDTvVej7&MKg9kHmC%-=elcTxYQ)DqhKHLG)sa56nW zH^5$+sXx1{Hd^D9z{4h0zP}uqWh_QCh*UOvSYV@3A-rfyKej^o8YLW<$^emid(wH> zxuB5V!HRZ-$QY%OPhjq3j{ec}!0Qb45wBwXp|79<)a%f3%Jf{p*gCR-t(si373Yy^ z6n5Y|4V^Fm_KpMKN|phW2b_wpysSL+YRov6npQDgwA5`|Gjznc=62=L56@xW_7zIM zR!&0AUKzlmeCAC2t5WyW@)I4PyVpAVC?9#pNmNqfUi{;78tM}e*$`$jck+V}o$6n8 zgfN1=^44#PHP_V{yD?%dtCBlXcLCJ64&Xx|)z9Ep7BK(6OZo1UN1VT&L@iVP$U7T7luLgEp&IF;`+>;{47ZcixtumDK`V`F`D840**Xuu4`enM`&atb|lnrly z!0(K>l;3j}b8I~KH1$a(xo>aV(I0JQWCn<#o&L9WjMT3=Xmea$A^O?%4ufJZn|dn?2U_O2ho z6^xm)brVzMkZ-bie5mMbDh4x@yW2k>Y&WVDKh&7W7@%f3&>h?IRffon27Qaf_cfASN5I69;9WWe^3-0<4|XJBlUk6waP*O diff --git a/web/documentserver-example/php/assets/images/logo.png b/web/documentserver-example/php/assets/images/logo.png deleted file mode 100644 index d433d89e2ea58b43a6e9903a830c65177e7e28c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2069 zcma)7i8mVv6OT%0qmCkVrLET8Rld59R^x~yDp^P9T2fVt*rkrDGbq~C5Q18&@`+N4 zR1Xn8N0gHCp;V}bAnFX2qK;h=KK=fJo%en-?>95=&6_v#W*)j=5Yk{(FaQ9MMj;*C z4lVfyj!GQrMaM5qhvrx~(klu8IH~mmVkkGwwL_;^lpDehQ1=1KKP12)TeK|z@H$6o z&kqCuNYD3GO0?69v()fb4ch#VJ>yQL{} z$Cl|>s8@N-wLG0y;t*g2s+5{g%X9P9JxhxDYaomfF^M}^u`;d~ijW0d6OX)sn4qNZ zPuAtd4r~7tDS8ilnK(-D)N+f?X_JQg5hSrW}X2yHwgJk zzIvk(|GCHyNCC^0jP)4KWE4#pd_sKy_H68G8wQbjm4r#Fzm`I85K^4vOI*b)hl}WD zuyvNU>0CDVX=Hsfk6{3V*WQlQB%vDoy*onTDVrvy)B>ySa&*BBXsv2K>#*DXHZ$H@ zP@LD!C9Y-}ou(ohc5*g- zFiw-2Ks=Z`R{L6O>r1iWSoZPyFqMPo9j~-6w-WF3AXHn^jppgF*Ax=8G&sxwQtAg}6@TU(eX8?`awX|eV$Bn{m--4XC+kG} ztjO(F-nQAQwe=(1GaS|EaH3~gG)uNBSHel+ zsaFPxR`|ql&(_%mSoKK-oqId>aLPo(yVI6$cLC3UI;7;M!8)q~Q;+Z!{D1wo+1a>D zOG$4W>0B3Rm^3H|n=>!*_ubi{<)~p#30;+8R77T=usdj~O)1(X)Q4a^KkzRn&tQ7! zZ)6(Sg+;c>>Ca>qu>v;tsBN^yCGNMRno>)XzFGg_01QXl>x4Q^+4o!+T6uW!1c={G zmKk2Is8T{zqpHxKqPX;t1q;8fVUBpWITC0C zYg-w_cPPa>EKJsxVjUGf-NNo7nNIOkAE-{NZ z6^k@)zvv_BRS#yz7$I6#1469NQS0r!8$*&SPnQje)CRrBTQhdGGl^4Y9IY89sxMZ= z`6uvlFS4^hs3cU);2fx#Wg&Ed+b}{5Oq@Iu^lL9~pmQwBX{!zhcW?SB+h>=jih+x` zU-8qlE!w4pnXc=f(**J5&bGux+n#o4-PZ}#l63c$bytd}?M=ksf%8pog0ZyDpg6}x zXTHDs)L(v>GrDTvVej7&MKg9kHmC%-=elcTxYQ)DqhKHLG)sa56nW zH^5$+sXx1{Hd^D9z{4h0zP}uqWh_QCh*UOvSYV@3A-rfyKej^o8YLW<$^emid(wH> zxuB5V!HRZ-$QY%OPhjq3j{ec}!0Qb45wBwXp|79<)a%f3%Jf{p*gCR-t(si373Yy^ z6n5Y|4V^Fm_KpMKN|phW2b_wpysSL+YRov6npQDgwA5`|Gjznc=62=L56@xW_7zIM zR!&0AUKzlmeCAC2t5WyW@)I4PyVpAVC?9#pNmNqfUi{;78tM}e*$`$jck+V}o$6n8 zgfN1=^44#PHP_V{yD?%dtCBlXcLCJ64&Xx|)z9Ep7BK(6OZo1UN1VT&L@iVP$U7T7luLgEp&IF;`+>;{47ZcixtumDK`V`F`D840**Xuu4`enM`&atb|lnrly z!0(K>l;3j}b8I~KH1$a(xo>aV(I0JQWCn<#o&L9WjMT3=Xmea$A^O?%4ufJZn|dn?2U_O2ho z6^xm)brVzMkZ-bie5mMbDh4x@yW2k>Y&WVDKh&7W7@%f3&>h?IRffon27Qaf_cfASN5I69;9WWe^3-0<4|XJBlUk6waP*O diff --git a/web/documentserver-example/php/src/views/DocEditorView.php b/web/documentserver-example/php/src/views/DocEditorView.php index e3e1b7f0..37adb0e7 100644 --- a/web/documentserver-example/php/src/views/DocEditorView.php +++ b/web/documentserver-example/php/src/views/DocEditorView.php @@ -192,12 +192,12 @@ final class DocEditorView extends View // an image for inserting $dataInsertImage = $isEnableDirectUrl ? [ - "fileType" => "png", - "url" => serverPath(true) . "/assets/images/logo.png", - "directUrl" => serverPath(false) . "/assets/images/logo.png", + "fileType" => "svg", + "url" => serverPath(true) . "/assets/images/logo.svg", + "directUrl" => serverPath(false) . "/assets/images/logo.svg", ] : [ - "fileType" => "png", - "url" => serverPath(true) . "/assets/images/logo.png", + "fileType" => "svg", + "url" => serverPath(true) . "/assets/images/logo.svg", ]; // a document for comparing diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index a3d29eaa..b4f40137 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -334,12 +334,12 @@ def edit(request): # an image which will be inserted into the document dataInsertImage = { - 'fileType': 'png', - 'url': docManager.getServerUrl(True, request) + '/static/images/logo.png', - 'directUrl': docManager.getServerUrl(False, request) + '/static/images/logo.png' + 'fileType': 'svg', + 'url': docManager.getServerUrl(True, request) + '/static/images/logo.svg', + 'directUrl': docManager.getServerUrl(False, request) + '/static/images/logo.svg' } if isEnableDirectUrl else { - 'fileType': 'png', - 'url': docManager.getServerUrl(True, request) + '/static/images/logo.png' + 'fileType': 'svg', + 'url': docManager.getServerUrl(True, request) + '/static/images/logo.svg' } # a document which will be compared with the current document diff --git a/web/documentserver-example/python/static/images/logo.png b/web/documentserver-example/python/static/images/logo.png deleted file mode 100644 index d433d89e2ea58b43a6e9903a830c65177e7e28c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2069 zcma)7i8mVv6OT%0qmCkVrLET8Rld59R^x~yDp^P9T2fVt*rkrDGbq~C5Q18&@`+N4 zR1Xn8N0gHCp;V}bAnFX2qK;h=KK=fJo%en-?>95=&6_v#W*)j=5Yk{(FaQ9MMj;*C z4lVfyj!GQrMaM5qhvrx~(klu8IH~mmVkkGwwL_;^lpDehQ1=1KKP12)TeK|z@H$6o z&kqCuNYD3GO0?69v()fb4ch#VJ>yQL{} z$Cl|>s8@N-wLG0y;t*g2s+5{g%X9P9JxhxDYaomfF^M}^u`;d~ijW0d6OX)sn4qNZ zPuAtd4r~7tDS8ilnK(-D)N+f?X_JQg5hSrW}X2yHwgJk zzIvk(|GCHyNCC^0jP)4KWE4#pd_sKy_H68G8wQbjm4r#Fzm`I85K^4vOI*b)hl}WD zuyvNU>0CDVX=Hsfk6{3V*WQlQB%vDoy*onTDVrvy)B>ySa&*BBXsv2K>#*DXHZ$H@ zP@LD!C9Y-}ou(ohc5*g- zFiw-2Ks=Z`R{L6O>r1iWSoZPyFqMPo9j~-6w-WF3AXHn^jppgF*Ax=8G&sxwQtAg}6@TU(eX8?`awX|eV$Bn{m--4XC+kG} ztjO(F-nQAQwe=(1GaS|EaH3~gG)uNBSHel+ zsaFPxR`|ql&(_%mSoKK-oqId>aLPo(yVI6$cLC3UI;7;M!8)q~Q;+Z!{D1wo+1a>D zOG$4W>0B3Rm^3H|n=>!*_ubi{<)~p#30;+8R77T=usdj~O)1(X)Q4a^KkzRn&tQ7! zZ)6(Sg+;c>>Ca>qu>v;tsBN^yCGNMRno>)XzFGg_01QXl>x4Q^+4o!+T6uW!1c={G zmKk2Is8T{zqpHxKqPX;t1q;8fVUBpWITC0C zYg-w_cPPa>EKJsxVjUGf-NNo7nNIOkAE-{NZ z6^k@)zvv_BRS#yz7$I6#1469NQS0r!8$*&SPnQje)CRrBTQhdGGl^4Y9IY89sxMZ= z`6uvlFS4^hs3cU);2fx#Wg&Ed+b}{5Oq@Iu^lL9~pmQwBX{!zhcW?SB+h>=jih+x` zU-8qlE!w4pnXc=f(**J5&bGux+n#o4-PZ}#l63c$bytd}?M=ksf%8pog0ZyDpg6}x zXTHDs)L(v>GrDTvVej7&MKg9kHmC%-=elcTxYQ)DqhKHLG)sa56nW zH^5$+sXx1{Hd^D9z{4h0zP}uqWh_QCh*UOvSYV@3A-rfyKej^o8YLW<$^emid(wH> zxuB5V!HRZ-$QY%OPhjq3j{ec}!0Qb45wBwXp|79<)a%f3%Jf{p*gCR-t(si373Yy^ z6n5Y|4V^Fm_KpMKN|phW2b_wpysSL+YRov6npQDgwA5`|Gjznc=62=L56@xW_7zIM zR!&0AUKzlmeCAC2t5WyW@)I4PyVpAVC?9#pNmNqfUi{;78tM}e*$`$jck+V}o$6n8 zgfN1=^44#PHP_V{yD?%dtCBlXcLCJ64&Xx|)z9Ep7BK(6OZo1UN1VT&L@iVP$U7T7luLgEp&IF;`+>;{47ZcixtumDK`V`F`D840**Xuu4`enM`&atb|lnrly z!0(K>l;3j}b8I~KH1$a(xo>aV(I0JQWCn<#o&L9WjMT3=Xmea$A^O?%4ufJZn|dn?2U_O2ho z6^xm)brVzMkZ-bie5mMbDh4x@yW2k>Y&WVDKh&7W7@%f3&>h?IRffon27Qaf_cfASN5I69;9WWe^3-0<4|XJBlUk6waP*O diff --git a/web/documentserver-example/ruby/app/assets/images/logo.png b/web/documentserver-example/ruby/app/assets/images/logo.png deleted file mode 100644 index d433d89e2ea58b43a6e9903a830c65177e7e28c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2069 zcma)7i8mVv6OT%0qmCkVrLET8Rld59R^x~yDp^P9T2fVt*rkrDGbq~C5Q18&@`+N4 zR1Xn8N0gHCp;V}bAnFX2qK;h=KK=fJo%en-?>95=&6_v#W*)j=5Yk{(FaQ9MMj;*C z4lVfyj!GQrMaM5qhvrx~(klu8IH~mmVkkGwwL_;^lpDehQ1=1KKP12)TeK|z@H$6o z&kqCuNYD3GO0?69v()fb4ch#VJ>yQL{} z$Cl|>s8@N-wLG0y;t*g2s+5{g%X9P9JxhxDYaomfF^M}^u`;d~ijW0d6OX)sn4qNZ zPuAtd4r~7tDS8ilnK(-D)N+f?X_JQg5hSrW}X2yHwgJk zzIvk(|GCHyNCC^0jP)4KWE4#pd_sKy_H68G8wQbjm4r#Fzm`I85K^4vOI*b)hl}WD zuyvNU>0CDVX=Hsfk6{3V*WQlQB%vDoy*onTDVrvy)B>ySa&*BBXsv2K>#*DXHZ$H@ zP@LD!C9Y-}ou(ohc5*g- zFiw-2Ks=Z`R{L6O>r1iWSoZPyFqMPo9j~-6w-WF3AXHn^jppgF*Ax=8G&sxwQtAg}6@TU(eX8?`awX|eV$Bn{m--4XC+kG} ztjO(F-nQAQwe=(1GaS|EaH3~gG)uNBSHel+ zsaFPxR`|ql&(_%mSoKK-oqId>aLPo(yVI6$cLC3UI;7;M!8)q~Q;+Z!{D1wo+1a>D zOG$4W>0B3Rm^3H|n=>!*_ubi{<)~p#30;+8R77T=usdj~O)1(X)Q4a^KkzRn&tQ7! zZ)6(Sg+;c>>Ca>qu>v;tsBN^yCGNMRno>)XzFGg_01QXl>x4Q^+4o!+T6uW!1c={G zmKk2Is8T{zqpHxKqPX;t1q;8fVUBpWITC0C zYg-w_cPPa>EKJsxVjUGf-NNo7nNIOkAE-{NZ z6^k@)zvv_BRS#yz7$I6#1469NQS0r!8$*&SPnQje)CRrBTQhdGGl^4Y9IY89sxMZ= z`6uvlFS4^hs3cU);2fx#Wg&Ed+b}{5Oq@Iu^lL9~pmQwBX{!zhcW?SB+h>=jih+x` zU-8qlE!w4pnXc=f(**J5&bGux+n#o4-PZ}#l63c$bytd}?M=ksf%8pog0ZyDpg6}x zXTHDs)L(v>GrDTvVej7&MKg9kHmC%-=elcTxYQ)DqhKHLG)sa56nW zH^5$+sXx1{Hd^D9z{4h0zP}uqWh_QCh*UOvSYV@3A-rfyKej^o8YLW<$^emid(wH> zxuB5V!HRZ-$QY%OPhjq3j{ec}!0Qb45wBwXp|79<)a%f3%Jf{p*gCR-t(si373Yy^ z6n5Y|4V^Fm_KpMKN|phW2b_wpysSL+YRov6npQDgwA5`|Gjznc=62=L56@xW_7zIM zR!&0AUKzlmeCAC2t5WyW@)I4PyVpAVC?9#pNmNqfUi{;78tM}e*$`$jck+V}o$6n8 zgfN1=^44#PHP_V{yD?%dtCBlXcLCJ64&Xx|)z9Ep7BK(6OZo1UN1VT&L@iVP$U7T7luLgEp&IF;`+>;{47ZcixtumDK`V`F`D840**Xuu4`enM`&atb|lnrly z!0(K>l;3j}b8I~KH1$a(xo>aV(I0JQWCn<#o&L9WjMT3=Xmea$A^O?%4ufJZn|dn?2U_O2ho z6^xm)brVzMkZ-bie5mMbDh4x@yW2k>Y&WVDKh&7W7@%f3&>h?IRffon27Qaf_cfASN5I69;9WWe^3-0<4|XJBlUk6waP*O diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 269397c8..7f1dbb28 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -356,14 +356,14 @@ class FileModel # direct url to the image insert_image = if enable_direct_url? == true { - fileType: 'png', # image file type - url: "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image - directUrl: "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image + fileType: 'svg', # image file type + url: "#{DocumentHelper.get_server_url(true)}/assets/logo.svg", # server url to the image + directUrl: "#{DocumentHelper.get_server_url(false)}/assets/logo.svg" # direct url to the image } else { - fileType: 'png', # image file type - url: "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image + fileType: 'svg', # image file type + url: "#{DocumentHelper.get_server_url(true)}/assets/logo.svg" # server url to the image } end From b3d3b81274f909d746abf70a5a3063ba0d2a5010 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Thu, 1 Feb 2024 12:39:36 +0300 Subject: [PATCH 13/25] copyright 2024 --- .../csharp-mvc/App_Start/BundleConfig.cs | 2 +- .../csharp-mvc/App_Start/FilterConfig.cs | 2 +- .../csharp-mvc/App_Start/RouteConfig.cs | 2 +- .../csharp-mvc/App_Start/WebApiConfig.cs | 2 +- web/documentserver-example/csharp-mvc/Content/editor.css | 2 +- web/documentserver-example/csharp-mvc/Content/media.css | 2 +- web/documentserver-example/csharp-mvc/Content/stylesheet.css | 2 +- .../csharp-mvc/Controllers/HomeController.cs | 2 +- web/documentserver-example/csharp-mvc/Global.asax.cs | 2 +- .../csharp-mvc/Helpers/DocManagerHelper.cs | 2 +- .../csharp-mvc/Helpers/DocumentConverter.cs | 2 +- web/documentserver-example/csharp-mvc/Helpers/JwtManager.cs | 2 +- web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs | 2 +- web/documentserver-example/csharp-mvc/Helpers/Users.cs | 2 +- web/documentserver-example/csharp-mvc/Helpers/Utils.cs | 2 +- web/documentserver-example/csharp-mvc/Models/FileModel.cs | 2 +- web/documentserver-example/csharp-mvc/Models/FileUtility.cs | 2 +- .../csharp-mvc/Properties/AssemblyInfo.cs | 2 +- .../csharp-mvc/Scripts/jquery.dropdownToggle.js | 2 +- web/documentserver-example/csharp-mvc/Scripts/jscript.js | 2 +- web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx | 2 +- web/documentserver-example/csharp-mvc/Views/Home/Index.aspx | 2 +- web/documentserver-example/csharp-mvc/Views/Shared/Error.aspx | 2 +- web/documentserver-example/csharp-mvc/WebEditor.ashx.cs | 2 +- web/documentserver-example/csharp/App_Themes/media.css | 2 +- web/documentserver-example/csharp/App_Themes/stylesheet.css | 2 +- web/documentserver-example/csharp/Default.aspx | 2 +- web/documentserver-example/csharp/Default.aspx.cs | 2 +- web/documentserver-example/csharp/DocEditor.aspx | 2 +- web/documentserver-example/csharp/DocEditor.aspx.cs | 2 +- web/documentserver-example/csharp/DocumentConverter.cs | 2 +- web/documentserver-example/csharp/FormatManager.cs | 2 +- web/documentserver-example/csharp/JwtManager.cs | 2 +- web/documentserver-example/csharp/Properties/AssemblyInfo.cs | 2 +- web/documentserver-example/csharp/TrackManager.cs | 2 +- web/documentserver-example/csharp/Users.cs | 2 +- web/documentserver-example/csharp/Utils.cs | 2 +- web/documentserver-example/csharp/WebEditor.ashx.cs | 2 +- .../csharp/script/jquery.dropdownToggle.js | 2 +- web/documentserver-example/csharp/script/jscript.js | 2 +- web/documentserver-example/java-spring/onlyoffice.header | 2 +- .../src/main/java/com/onlyoffice/integration/ExampleData.java | 2 +- .../com/onlyoffice/integration/IntegrationApplication.java | 2 +- .../com/onlyoffice/integration/IntegrationConfiguration.java | 2 +- .../onlyoffice/integration/controllers/EditorController.java | 2 +- .../onlyoffice/integration/controllers/FileController.java | 2 +- .../onlyoffice/integration/controllers/IndexController.java | 2 +- .../integration/documentserver/callbacks/Callback.java | 2 +- .../integration/documentserver/callbacks/CallbackHandler.java | 2 +- .../integration/documentserver/callbacks/Status.java | 2 +- .../callbacks/implementations/EditCallback.java | 2 +- .../callbacks/implementations/ForcesaveCallback.java | 2 +- .../callbacks/implementations/SaveCallback.java | 2 +- .../documentserver/managers/callback/CallbackManager.java | 2 +- .../managers/callback/DefaultCallbackManager.java | 2 +- .../managers/document/DefaultDocumentManager.java | 2 +- .../documentserver/managers/document/DocumentManager.java | 2 +- .../managers/history/DefaultHistoryManager.java | 2 +- .../documentserver/managers/history/HistoryManager.java | 2 +- .../documentserver/managers/jwt/DefaultJwtManager.java | 2 +- .../integration/documentserver/managers/jwt/JwtManager.java | 2 +- .../managers/template/SampleTemplateManager.java | 2 +- .../documentserver/managers/template/TemplateManager.java | 2 +- .../integration/documentserver/models/AbstractModel.java | 2 +- .../onlyoffice/integration/documentserver/models/Format.java | 2 +- .../documentserver/models/configurations/Customization.java | 2 +- .../documentserver/models/configurations/Embedded.java | 2 +- .../documentserver/models/configurations/Goback.java | 2 +- .../documentserver/models/configurations/Info.java | 2 +- .../integration/documentserver/models/enums/Action.java | 2 +- .../documentserver/models/enums/ConvertErrorType.java | 2 +- .../integration/documentserver/models/enums/DocumentType.java | 2 +- .../integration/documentserver/models/enums/Mode.java | 2 +- .../documentserver/models/enums/ToolbarDocked.java | 2 +- .../integration/documentserver/models/enums/Type.java | 2 +- .../documentserver/models/filemodel/CommentGroup.java | 2 +- .../integration/documentserver/models/filemodel/Document.java | 2 +- .../documentserver/models/filemodel/EditorConfig.java | 2 +- .../documentserver/models/filemodel/FileModel.java | 2 +- .../documentserver/models/filemodel/Permission.java | 2 +- .../documentserver/models/filemodel/ReferenceData.java | 2 +- .../integration/documentserver/models/filemodel/Template.java | 2 +- .../integration/documentserver/models/filemodel/User.java | 2 +- .../integration/documentserver/serializers/FilterState.java | 2 +- .../documentserver/serializers/SerializerFilter.java | 2 +- .../documentserver/storage/FileStorageMutator.java | 2 +- .../documentserver/storage/FileStoragePathBuilder.java | 2 +- .../integration/documentserver/storage/LocalFileStorage.java | 2 +- .../onlyoffice/integration/documentserver/util/Constants.java | 2 +- .../com/onlyoffice/integration/documentserver/util/Misc.java | 2 +- .../onlyoffice/integration/documentserver/util/SSLUtils.java | 2 +- .../documentserver/util/file/DefaultFileUtility.java | 2 +- .../integration/documentserver/util/file/FileUtility.java | 2 +- .../documentserver/util/service/DefaultFormatService.java | 2 +- .../documentserver/util/service/DefaultServiceConverter.java | 2 +- .../documentserver/util/service/FormatService.java | 2 +- .../documentserver/util/service/ServiceConverter.java | 2 +- .../src/main/java/com/onlyoffice/integration/dto/Action.java | 2 +- .../java/com/onlyoffice/integration/dto/ChangesHistory.java | 2 +- .../main/java/com/onlyoffice/integration/dto/ChangesUser.java | 2 +- .../src/main/java/com/onlyoffice/integration/dto/Convert.java | 2 +- .../java/com/onlyoffice/integration/dto/ConvertedData.java | 2 +- .../main/java/com/onlyoffice/integration/dto/Converter.java | 2 +- .../src/main/java/com/onlyoffice/integration/dto/History.java | 2 +- .../main/java/com/onlyoffice/integration/dto/Mentions.java | 2 +- .../src/main/java/com/onlyoffice/integration/dto/Protect.java | 2 +- .../main/java/com/onlyoffice/integration/dto/Reference.java | 2 +- .../java/com/onlyoffice/integration/dto/ReferenceData.java | 2 +- .../src/main/java/com/onlyoffice/integration/dto/Rename.java | 2 +- .../src/main/java/com/onlyoffice/integration/dto/Restore.java | 2 +- .../src/main/java/com/onlyoffice/integration/dto/SaveAs.java | 2 +- .../src/main/java/com/onlyoffice/integration/dto/Track.java | 2 +- .../main/java/com/onlyoffice/integration/dto/UserInfo.java | 2 +- .../com/onlyoffice/integration/entities/AbstractEntity.java | 2 +- .../main/java/com/onlyoffice/integration/entities/Group.java | 2 +- .../java/com/onlyoffice/integration/entities/Permission.java | 2 +- .../main/java/com/onlyoffice/integration/entities/User.java | 2 +- .../com/onlyoffice/integration/mappers/AbstractMapper.java | 2 +- .../main/java/com/onlyoffice/integration/mappers/Mapper.java | 2 +- .../com/onlyoffice/integration/mappers/PermissionsMapper.java | 2 +- .../java/com/onlyoffice/integration/mappers/UsersMapper.java | 2 +- .../onlyoffice/integration/repositories/GroupRepository.java | 2 +- .../integration/repositories/PermissionRepository.java | 2 +- .../onlyoffice/integration/repositories/UserRepository.java | 2 +- .../com/onlyoffice/integration/services/GroupServices.java | 2 +- .../onlyoffice/integration/services/PermissionServices.java | 2 +- .../com/onlyoffice/integration/services/UserServices.java | 2 +- .../integration/services/configurers/Configurer.java | 2 +- .../services/configurers/CustomizationConfigurer.java | 2 +- .../integration/services/configurers/DocumentConfigurer.java | 2 +- .../services/configurers/EditorConfigConfigurer.java | 2 +- .../integration/services/configurers/EmbeddedConfigurer.java | 2 +- .../integration/services/configurers/FileConfigurer.java | 2 +- .../implementations/DefaultCustomizationConfigurer.java | 2 +- .../implementations/DefaultDocumentConfigurer.java | 2 +- .../implementations/DefaultEditorConfigConfigurer.java | 2 +- .../implementations/DefaultEmbeddedConfigurer.java | 2 +- .../configurers/implementations/DefaultFileConfigurer.java | 2 +- .../configurers/wrappers/DefaultCustomizationWrapper.java | 2 +- .../services/configurers/wrappers/DefaultDocumentWrapper.java | 2 +- .../services/configurers/wrappers/DefaultEmbeddedWrapper.java | 2 +- .../services/configurers/wrappers/DefaultFileWrapper.java | 2 +- .../java-spring/src/main/resources/static/css/editor.css | 2 +- .../java-spring/src/main/resources/static/css/stylesheet.css | 2 +- .../src/main/resources/static/scripts/converter.js | 2 +- .../main/resources/static/scripts/jquery.dropdownToggle.js | 2 +- .../java-spring/src/main/resources/static/scripts/jscript.js | 2 +- .../java-spring/src/main/resources/templates/editor.html | 2 +- .../java-spring/src/main/resources/templates/error.html | 2 +- .../java-spring/src/main/resources/templates/index.html | 4 ++-- web/documentserver-example/java/onlyoffice.header | 2 +- .../java/src/main/java/controllers/EditorServlet.java | 2 +- .../main/java/controllers/GlobalServletContextListener.java | 2 +- .../java/src/main/java/controllers/IndexServlet.java | 2 +- .../java/src/main/java/entities/CommentGroups.java | 2 +- .../java/src/main/java/entities/FileModel.java | 2 +- .../java/src/main/java/entities/FileType.java | 2 +- .../java/src/main/java/entities/User.java | 2 +- .../java/src/main/java/format/Format.java | 2 +- .../java/src/main/java/format/FormatManager.java | 2 +- .../java/src/main/java/helpers/ConfigManager.java | 2 +- .../java/src/main/java/helpers/CookieManager.java | 2 +- .../java/src/main/java/helpers/DocumentManager.java | 2 +- .../java/src/main/java/helpers/FileUtility.java | 2 +- .../java/src/main/java/helpers/ServiceConverter.java | 2 +- .../java/src/main/java/helpers/TrackManager.java | 2 +- .../java/src/main/java/helpers/Users.java | 2 +- .../java/src/main/java/utils/Constants.java | 2 +- .../java/src/main/java/utils/ConvertErrorType.java | 2 +- .../java/src/main/java/utils/StatusType.java | 2 +- .../java/src/main/webapp/css/editor.css | 2 +- web/documentserver-example/java/src/main/webapp/css/media.css | 2 +- .../java/src/main/webapp/css/stylesheet.css | 2 +- web/documentserver-example/java/src/main/webapp/editor.jsp | 2 +- web/documentserver-example/java/src/main/webapp/index.jsp | 4 ++-- .../java/src/main/webapp/scripts/jquery.dropdownToggle.js | 2 +- .../java/src/main/webapp/scripts/jscript.js | 2 +- web/documentserver-example/js/OnlineEditorsExampleJS.html | 2 +- web/documentserver-example/js/init.js | 2 +- web/documentserver-example/js/stylesheet.css | 2 +- web/documentserver-example/nodejs/app.js | 2 +- web/documentserver-example/nodejs/helpers/cacheManager.js | 2 +- web/documentserver-example/nodejs/helpers/docManager.js | 2 +- web/documentserver-example/nodejs/helpers/documentService.js | 2 +- web/documentserver-example/nodejs/helpers/fileUtility.js | 2 +- web/documentserver-example/nodejs/helpers/guidManager.js | 2 +- web/documentserver-example/nodejs/helpers/users.js | 2 +- .../nodejs/helpers/wopi/filesController.js | 2 +- web/documentserver-example/nodejs/helpers/wopi/lockManager.js | 2 +- web/documentserver-example/nodejs/helpers/wopi/request.js | 2 +- .../nodejs/helpers/wopi/tokenValidator.js | 2 +- web/documentserver-example/nodejs/helpers/wopi/utils.js | 2 +- web/documentserver-example/nodejs/helpers/wopi/wopiRouting.js | 2 +- .../nodejs/public/javascripts/jquery.dropdownToggle.js | 2 +- .../nodejs/public/javascripts/jscript.js | 2 +- .../nodejs/public/stylesheets/editor.css | 2 +- .../nodejs/public/stylesheets/media-wopi.css | 2 +- .../nodejs/public/stylesheets/media.css | 2 +- .../nodejs/public/stylesheets/stylesheet.css | 2 +- web/documentserver-example/nodejs/views/editor.ejs | 2 +- web/documentserver-example/nodejs/views/error.ejs | 2 +- web/documentserver-example/nodejs/views/index.ejs | 4 ++-- web/documentserver-example/nodejs/views/wopiAction.ejs | 2 +- web/documentserver-example/nodejs/views/wopiIndex.ejs | 4 ++-- web/documentserver-example/php/assets/css/media.css | 2 +- web/documentserver-example/php/assets/css/stylesheet.css | 2 +- .../php/assets/js/jquery.dropdownToggle.js | 2 +- web/documentserver-example/php/assets/js/jscript.js | 2 +- web/documentserver-example/php/index.php | 2 +- web/documentserver-example/php/src/ajax.php | 2 +- web/documentserver-example/php/src/common/HTTPStatus.php | 2 +- web/documentserver-example/php/src/common/Path.php | 2 +- .../php/src/common/PathAbsolutePOSIXTests.php | 2 +- .../php/src/common/PathJoinPOSIXTests.php | 2 +- .../php/src/common/PathNormalizePOSIXTests.php | 2 +- .../php/src/common/PathStringPOSIXTests.php | 2 +- web/documentserver-example/php/src/common/URL.php | 2 +- .../php/src/common/URLFromComponentsTests.php | 2 +- .../php/src/common/URLJoinPathTests.php | 2 +- web/documentserver-example/php/src/common/URLStringTests.php | 2 +- .../php/src/configuration/ConfigurationManager.php | 2 +- .../ConfigurationManagerConversionTimeoutTests.php | 2 +- .../ConfigurationManagerDocumentServerAPIURLTests.php | 2 +- .../ConfigurationManagerDocumentServerCommandURLTests.php | 2 +- .../ConfigurationManagerDocumentServerConverterURLTests.php | 2 +- .../ConfigurationManagerDocumentServerPreloaderURLTests.php | 2 +- .../ConfigurationManagerDocumentServerPrivateURLTests.php | 2 +- .../ConfigurationManagerDocumentServerPublicURLTests.php | 2 +- .../src/configuration/ConfigurationManagerExampleURLTests.php | 2 +- .../src/configuration/ConfigurationManagerJWTHeaderTests.php | 2 +- .../src/configuration/ConfigurationManagerJWTSecretTests.php | 2 +- .../configuration/ConfigurationManagerJWTUseForRequest.php | 2 +- .../ConfigurationManagerMaximumFileSizeTests.php | 2 +- .../php/src/configuration/ConfigurationManagerSSLTests.php | 2 +- .../src/configuration/ConfigurationManagerSingleUserTests.php | 2 +- .../configuration/ConfigurationManagerStoragePathTests.php | 2 +- .../php/src/configuration/ConfigurationManagerTests.php | 2 +- web/documentserver-example/php/src/format/Format.php | 2 +- web/documentserver-example/php/src/format/FormatManager.php | 2 +- .../php/src/format/FormatManagerAllTests.php | 2 +- .../php/src/format/FormatManagerConvertibleTests.php | 2 +- .../php/src/format/FormatManagerEditableTests.php | 2 +- .../php/src/format/FormatManagerFillableTests.php | 2 +- .../php/src/format/FormatManagerViewableTests.php | 2 +- web/documentserver-example/php/src/format/FormatTests.php | 2 +- web/documentserver-example/php/src/functions.php | 2 +- web/documentserver-example/php/src/helpers/ExampleUsers.php | 2 +- web/documentserver-example/php/src/helpers/JwtManager.php | 2 +- web/documentserver-example/php/src/helpers/Users.php | 2 +- web/documentserver-example/php/src/proxy/ProxyManager.php | 2 +- .../php/src/proxy/ProxyManagerTests.php | 2 +- web/documentserver-example/php/src/trackmanager.php | 2 +- web/documentserver-example/php/src/views/DocEditorView.php | 2 +- .../php/src/views/IndexStoredListView.php | 2 +- web/documentserver-example/php/src/views/IndexView.php | 2 +- web/documentserver-example/php/src/views/View.php | 2 +- web/documentserver-example/python/src/common/__init__.py | 2 +- web/documentserver-example/python/src/common/http.py | 2 +- web/documentserver-example/python/src/common/http_tests.py | 2 +- web/documentserver-example/python/src/common/string.py | 2 +- web/documentserver-example/python/src/common/string_tests.py | 2 +- .../python/src/configuration/__init__.py | 2 +- .../python/src/configuration/configuration.py | 2 +- .../python/src/configuration/configuration_tests.py | 2 +- web/documentserver-example/python/src/format/__init__.py | 2 +- web/documentserver-example/python/src/format/format.py | 2 +- web/documentserver-example/python/src/format/format_tests.py | 2 +- web/documentserver-example/python/src/memoize/__init__.py | 2 +- web/documentserver-example/python/src/memoize/memoize.py | 2 +- .../python/src/memoize/memoize_tests.py | 2 +- web/documentserver-example/python/src/proxy/__init__.py | 2 +- web/documentserver-example/python/src/proxy/proxy.py | 2 +- web/documentserver-example/python/src/proxy/proxy_tests.py | 2 +- web/documentserver-example/python/src/response/__init__.py | 2 +- web/documentserver-example/python/src/response/response.py | 2 +- web/documentserver-example/python/src/utils/docManager.py | 2 +- web/documentserver-example/python/src/utils/fileUtils.py | 2 +- web/documentserver-example/python/src/utils/historyManager.py | 2 +- web/documentserver-example/python/src/utils/jwtManager.py | 2 +- .../python/src/utils/serviceConverter.py | 2 +- web/documentserver-example/python/src/utils/trackManager.py | 2 +- web/documentserver-example/python/src/utils/users.py | 2 +- web/documentserver-example/python/src/views/actions.py | 2 +- web/documentserver-example/python/src/views/index.py | 2 +- web/documentserver-example/python/static/css/editor.css | 2 +- web/documentserver-example/python/static/css/media.css | 2 +- web/documentserver-example/python/static/css/stylesheet.css | 2 +- web/documentserver-example/python/static/js/jscript.js | 2 +- web/documentserver-example/python/templates/editor.html | 2 +- web/documentserver-example/python/templates/index.html | 4 ++-- .../ruby/app/assets/javascripts/jquery.dropdownToggle.js | 2 +- .../ruby/app/assets/javascripts/jscript.js | 2 +- .../ruby/app/assets/stylesheets/editor.scss | 2 +- .../ruby/app/assets/stylesheets/media.css | 2 +- .../ruby/app/assets/stylesheets/stylesheet.scss | 2 +- .../ruby/app/configuration/configuration.rb | 2 +- .../ruby/app/configuration/configuration_tests.rb | 2 +- .../ruby/app/controllers/application_controller.rb | 2 +- .../ruby/app/controllers/home_controller.rb | 2 +- web/documentserver-example/ruby/app/format/format.rb | 2 +- web/documentserver-example/ruby/app/format/format_tests.rb | 2 +- .../ruby/app/helpers/application_helper.rb | 2 +- web/documentserver-example/ruby/app/helpers/home_helper.rb | 2 +- web/documentserver-example/ruby/app/models/document_helper.rb | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- web/documentserver-example/ruby/app/models/file_utility.rb | 2 +- web/documentserver-example/ruby/app/models/jwt_helper.rb | 2 +- .../ruby/app/models/service_converter.rb | 2 +- web/documentserver-example/ruby/app/models/track_helper.rb | 2 +- web/documentserver-example/ruby/app/models/users.rb | 2 +- web/documentserver-example/ruby/app/proxy/proxy.rb | 2 +- web/documentserver-example/ruby/app/proxy/proxy_tests.rb | 2 +- .../ruby/app/views/home/editor.html.erb | 2 +- web/documentserver-example/ruby/app/views/home/index.html.erb | 2 +- .../ruby/app/views/layouts/application.html.erb | 2 +- 315 files changed, 320 insertions(+), 320 deletions(-) diff --git a/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs b/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs index 9fb3de29..0613f38b 100644 --- a/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs +++ b/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs b/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs index 0809eedd..7878b8c8 100644 --- a/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs +++ b/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs b/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs index 6903f358..4d9803d7 100644 --- a/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs +++ b/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs b/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs index cee3edc2..5135156e 100644 --- a/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs +++ b/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Content/editor.css b/web/documentserver-example/csharp-mvc/Content/editor.css index 104b14c1..6ec3cd1c 100644 --- a/web/documentserver-example/csharp-mvc/Content/editor.css +++ b/web/documentserver-example/csharp-mvc/Content/editor.css @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Content/media.css b/web/documentserver-example/csharp-mvc/Content/media.css index 5ec026f1..705085cc 100644 --- a/web/documentserver-example/csharp-mvc/Content/media.css +++ b/web/documentserver-example/csharp-mvc/Content/media.css @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Content/stylesheet.css b/web/documentserver-example/csharp-mvc/Content/stylesheet.css index 26e289cd..6ca4a771 100644 --- a/web/documentserver-example/csharp-mvc/Content/stylesheet.css +++ b/web/documentserver-example/csharp-mvc/Content/stylesheet.css @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs index 70bbca2b..c863de2e 100644 --- a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs +++ b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Global.asax.cs b/web/documentserver-example/csharp-mvc/Global.asax.cs index 0939d4ec..7931e4c2 100644 --- a/web/documentserver-example/csharp-mvc/Global.asax.cs +++ b/web/documentserver-example/csharp-mvc/Global.asax.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs index fc5896e4..0af5f59a 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs b/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs index 145c509d..3f395ec3 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Helpers/JwtManager.cs b/web/documentserver-example/csharp-mvc/Helpers/JwtManager.cs index ea2b0642..455820ca 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/JwtManager.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/JwtManager.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs b/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs index ef777ae9..27ff3f00 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Helpers/Users.cs b/web/documentserver-example/csharp-mvc/Helpers/Users.cs index 41f264a8..60469aa9 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/Users.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/Users.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Helpers/Utils.cs b/web/documentserver-example/csharp-mvc/Helpers/Utils.cs index 44c8c48a..a986b665 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/Utils.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/Utils.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs index 1851b199..2438ffcd 100755 --- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs index 99dbe9da..97490aa6 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs b/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs index fad76dd5..e9446709 100644 --- a/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs +++ b/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Ascensio System SIA")] [assembly: AssemblyProduct("OnlineEditorsExampleMVC")] -[assembly: AssemblyCopyright("Ascensio System SIA 2023")] +[assembly: AssemblyCopyright("Ascensio System SIA 2024")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/web/documentserver-example/csharp-mvc/Scripts/jquery.dropdownToggle.js b/web/documentserver-example/csharp-mvc/Scripts/jquery.dropdownToggle.js index d908bccb..5f92e5d9 100644 --- a/web/documentserver-example/csharp-mvc/Scripts/jquery.dropdownToggle.js +++ b/web/documentserver-example/csharp-mvc/Scripts/jquery.dropdownToggle.js @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Scripts/jscript.js b/web/documentserver-example/csharp-mvc/Scripts/jscript.js index 8b4ab978..35d82796 100644 --- a/web/documentserver-example/csharp-mvc/Scripts/jscript.js +++ b/web/documentserver-example/csharp-mvc/Scripts/jscript.js @@ -1,6 +1,6 @@ /** * - * (c) Copyright Ascensio System SIA 2023 + * (c) Copyright Ascensio System SIA 2024 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx index a7ea668d..ab0c8033 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx @@ -14,7 +14,7 @@