Merge branch hotfix/v6.4.1 into master

update templates
support oxps
2026-04-07 14:06:11 +08:00 · 2021-09-28 08:03:23 +00:00 · 2021-09-14 09:29:20 +03:00 · 2021-09-14 09:29:19 +03:00 · 2021-09-14 08:41:46 +03:00 · 2021-09-10 17:14:35 +03:00
25 changed files with 29 additions and 28 deletions
--- a/Readme.md
+++ b/Readme.md
@ -72,9 +72,9 @@ ONLYOFFICE for developers: [https://www.onlyoffice.com/developer-edition.aspx](h

 ## User Feedback and Support

-If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum to find answers to your questions: [dev.onlyoffice.org][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][3].
+If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum to find answers to your questions: [forum.onlyoffice.com][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][3].

-  [1]: http://dev.onlyoffice.org
+  [1]: https://forum.onlyoffice.com
  [2]: https://github.com/ONLYOFFICE/DocumentServer
  [3]: http://stackoverflow.com/questions/tagged/onlyoffice
  
--- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
@ -49,7 +49,7 @@ namespace OnlineEditorsExampleMVC.Models
                ".dot", ".dotx", ".dotm",
                ".odt", ".fodt", ".ott", ".rtf", ".txt",
                ".html", ".htm", ".mht", ".xml",
-                ".pdf", ".djvu", ".fb2", ".epub", ".xps"
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
            };

        // spreadsheet extensions
--- a/web/documentserver-example/csharp-mvc/assets
+++ b/web/documentserver-example/csharp-mvc/assets
--- a/web/documentserver-example/csharp-mvc/web.appsettings.config
+++ b/web/documentserver-example/csharp-mvc/web.appsettings.config
@ -9,7 +9,7 @@

  <add key="filesize-max" value="5242880"/>

-  <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps"/>
+  <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
  <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>
  <add key="files.docservice.timeout" value="120000" />
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@ -56,7 +56,7 @@ namespace OnlineEditorsExample
                ".dot", ".dotx", ".dotm",
                ".odt", ".fodt", ".ott", ".rtf", ".txt",
                ".html", ".htm", ".mht", ".xml",
-                ".pdf", ".djvu", ".fb2", ".epub", ".xps"
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
            };

        // get an internal file extension
--- a/web/documentserver-example/csharp/assets
+++ b/web/documentserver-example/csharp/assets
--- a/web/documentserver-example/csharp/settings.config
+++ b/web/documentserver-example/csharp/settings.config
@ -5,7 +5,7 @@
  <add key="filesize-max" value="5242880"/>
  <add key="storage-path" value=""/>

-  <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps"/>
+  <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
  <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>
  <add key="files.docservice.timeout" value="120000" />
--- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
+++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
@ -57,7 +57,7 @@ public class FileUtility
                    ".dot", ".dotx", ".dotm",
                    ".odt", ".fodt", ".ott", ".rtf", ".txt",
                    ".html", ".htm", ".mht", ".xml",
-                    ".pdf", ".djvu", ".fb2", ".epub", ".xps"
+                    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
            );

    // spreadsheet extensions
--- a/web/documentserver-example/java/src/main/resources/assets
+++ b/web/documentserver-example/java/src/main/resources/assets
--- a/web/documentserver-example/java/src/main/resources/settings.properties
+++ b/web/documentserver-example/java/src/main/resources/settings.properties
@ -1,7 +1,7 @@
 filesize-max=5242880
 storage-folder=app_data

-files.docservice.viewed-docs=.pdf|.djvu|.xps
+files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
 files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
 files.docservice.timeout=120000
--- a/web/documentserver-example/js/init.js
+++ b/web/documentserver-example/js/init.js
@ -65,7 +65,7 @@ function key(k) {
 };

 var getDocumentType = function (ext) {
-    if (".doc.docx.docm.dot.dotx.dotm.odt.fodt.ott.rtf.txt.html.htm.mht.xml.pdf.djvu.fb2.epub.xps".indexOf(ext) != -1) return "text";
+    if (".doc.docx.docm.dot.dotx.dotm.odt.fodt.ott.rtf.txt.html.htm.mht.xml.pdf.djvu.fb2.epub.xps.oxps".indexOf(ext) != -1) return "text";
    if (".xls.xlsx.xlsm.xlt.xltx.xltm.ods.fods.ots.csv".indexOf(ext) != -1) return "spreadsheet";
    if (".pps.ppsx.ppsm.ppt.pptx.pptm.pot.potx.potm.odp.fodp.otp".indexOf(ext) != -1) return "presentation";
    return null;
--- a/web/documentserver-example/nodejs/config/default.json
+++ b/web/documentserver-example/nodejs/config/default.json
@ -21,7 +21,7 @@
    "apiUrl": "web-apps/apps/api/documents/api.js",
    "preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html",
    "exampleUrl": null,
-    "viewedDocs": [".pdf", ".djvu", ".xps"],
+    "viewedDocs": [".pdf", ".djvu", ".xps", ".oxps"],
    "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".txt"],
    "convertedDocs": [".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".xml", ".epub", ".fb2"],
    "storageFolder": "./files",
--- a/web/documentserver-example/nodejs/helpers/fileUtility.js
+++ b/web/documentserver-example/nodejs/helpers/fileUtility.js
@ -63,7 +63,7 @@ fileUtility.fileType = {
 }

 // the document extension list
-fileUtility.documentExts = [".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".fodt", ".ott", ".rtf", ".txt", ".html", ".htm", ".mht", ".xml", ".pdf", ".djvu", ".fb2", ".epub", ".xps"];
+fileUtility.documentExts = [".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".fodt", ".ott", ".rtf", ".txt", ".html", ".htm", ".mht", ".xml", ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"];

 // the spreadsheet extension list
 fileUtility.spreadsheetExts = [".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", ".ods", ".fods", ".ots", ".csv"];
--- a/web/documentserver-example/nodejs/public/assets
+++ b/web/documentserver-example/nodejs/public/assets
--- a/web/documentserver-example/nodejs/public/javascripts/jscript.js
+++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js
@ -101,7 +101,8 @@ if (typeof jQuery != "undefined") {
    });
    
    var timer = null;
-    var checkConvert = function (filePass = null) {
+    var checkConvert = function (filePass) {
+        filePass = null;
        if (timer != null) {
            clearTimeout(timer);
        }
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@ -161,7 +161,7 @@
            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
        };

-        var config = {<%- include("config") %>, events};
+        var config = {<%- include("config") %>, events: events};

        var connectEditor = function () {
            addMentions();
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@ -133,7 +133,7 @@
                                </table>

                                <div class="links-panel links-panel-border clearFix">
-                                    <a href="/wopi" class="">Go to WOPI page</a>
+                                    <a href="./wopi" class="">Go to WOPI page</a>
                                </div>
                            </div>
                        </div>
--- a/web/documentserver-example/nodejs/views/wopiIndex.ejs
+++ b/web/documentserver-example/nodejs/views/wopiIndex.ejs
@ -130,7 +130,7 @@
                            </table>

                            <div class="links-panel links-panel-border clearFix">
-                                <a href="/" class="">Go to Index page</a>
+                                <a href="./" class="">Go to Index page</a>
                            </div>
                        </div>
                    </td>
--- a/web/documentserver-example/php/assets
+++ b/web/documentserver-example/php/assets
--- a/web/documentserver-example/php/config.php
+++ b/web/documentserver-example/php/config.php
@ -4,7 +4,7 @@ $GLOBALS['FILE_SIZE_MAX'] = 5242880;
 $GLOBALS['STORAGE_PATH'] = "";
 $GLOBALS['ALONE'] = FALSE;

-$GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps");
+$GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps", ".oxps");
 $GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".txt");
 $GLOBALS['DOC_SERV_CONVERT'] = array(".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".xml", ".epub", ".fb2");

@ -39,7 +39,7 @@ $GLOBALS['ExtsDocument'] = array(".doc", ".docx", ".docm",
                                 ".dot", ".dotx", ".dotm",
                                 ".odt", ".fodt", ".ott", ".rtf", ".txt",
                                 ".html", ".htm", ".mht", ".xml",
-                                 ".pdf", ".djvu", ".fb2", ".epub", ".xps");
+                                 ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps");


 ?>
--- a/web/documentserver-example/python/assets
+++ b/web/documentserver-example/python/assets
--- a/web/documentserver-example/python/config.py
+++ b/web/documentserver-example/python/config.py
@ -3,7 +3,7 @@ import os
 FILE_SIZE_MAX = 5242880
 STORAGE_PATH = 'app_data'

-DOC_SERV_VIEWED = [".pdf", ".djvu", ".xps"]  # file extensions that can be viewed
+DOC_SERV_VIEWED = [".pdf", ".djvu", ".xps", ".oxps"]  # file extensions that can be viewed
 DOC_SERV_EDITED = [".docx", ".xlsx", ".csv", ".pptx", ".txt"]  # file extensions that can be edited
 DOC_SERV_CONVERT = [                                           # file extensions that can be converted
    ".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt",
@ -45,7 +45,7 @@ EXT_DOCUMENT = [
    ".dot", ".dotx", ".dotm",
    ".odt", ".fodt", ".ott", ".rtf", ".txt",
    ".html", ".htm", ".mht", ".xml",
-    ".pdf", ".djvu", ".fb2", ".epub", ".xps"
+    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
 ]

 if os.environ.get("EXAMPLE_DOMAIN"):  # generates a link for example domain
--- a/web/documentserver-example/ruby/app/models/file_utility.rb
+++ b/web/documentserver-example/ruby/app/models/file_utility.rb
@ -18,7 +18,7 @@ class FileUtility

  
  # the document extension list
-  @@exts_document = %w(.doc .docx .docm .dot .dotx .dotm .odt .fodt .ott .rtf .txt .html .htm .mht .xml .pdf .djvu .fb2 .epub .xps)
+  @@exts_document = %w(.doc .docx .docm .dot .dotx .dotm .odt .fodt .ott .rtf .txt .html .htm .mht .xml .pdf .djvu .fb2 .epub .xps .oxps)

  # the spreadsheet extension list
  @@exts_spreadsheet = %w(.xls .xlsx .xlsm .xlt .xltx .xltm .ods .fods .ots .csv)
--- a/web/documentserver-example/ruby/config/application.rb
+++ b/web/documentserver-example/ruby/config/application.rb
@ -32,7 +32,7 @@ module OnlineEditorsExampleRuby
    Rails.configuration.storagePath="app_data"
    Rails.configuration.timeout=120

-    Rails.configuration.viewedDocs=".pdf|.djvu|.xps"
+    Rails.configuration.viewedDocs=".pdf|.djvu|.xps|.oxps"
    Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.txt"
    Rails.configuration.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"

--- a/web/documentserver-example/ruby/public/assets
+++ b/web/documentserver-example/ruby/public/assets
Author	SHA1	Message	Date
papacarlo	8da151ff7c	Merge branch hotfix/v6.4.1 into master	2021-09-28 08:03:23 +00:00
Sergey Linnik	d3581658b7	update templates	2021-09-14 09:29:20 +03:00
Sergey Linnik	7027970b65	support oxps	2021-09-14 09:29:19 +03:00
Sergey Linnik	8774286d8e	Merge pull request #191 from ONLYOFFICE/feature/update-readme-link Update Readme.md	2021-09-14 08:41:46 +03:00
svetlana maleeva	f0087361b6	Update Readme.md	2021-09-10 17:14:35 +03:00
Oleg Sinizin	d8e229df2c	replace set filepass null	2021-08-30 18:56:18 +03:00
Oleg Sinizin	5b3f62a011	fix for IE 11	2021-08-30 18:56:00 +03:00
Sergey Linnik	3639e9706f	Merge pull request #184 from ONLYOFFICE/feature/wopi-url-fix href fix	2021-08-30 18:54:59 +03:00
Oleg Sinizin	9ba69f6aef	href fix	2021-08-25 17:55:48 +03:00