diff --git a/CHANGELOG.md b/CHANGELOG.md index 331438a7..5142494e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,14 @@ # Change Log +- ur skin language +- nodejs: preload frame moved from uploading popap - change preload.html address -- view odg +- view odg, md - edit xlsb - php-laravel: fix custom jwt header - features tips for anonymous - support vsdx in diagram editor +- nodejs: fix wopi verification - nodejs: user role - nodejs: start filling diff --git a/web/documentserver-example/csharp-mvc/assets/document-formats b/web/documentserver-example/csharp-mvc/assets/document-formats index 898b1b32..e55e781c 160000 --- a/web/documentserver-example/csharp-mvc/assets/document-formats +++ b/web/documentserver-example/csharp-mvc/assets/document-formats @@ -1 +1 @@ -Subproject commit 898b1b32ac4e5a0cc084fab10c3ef664fb51b247 +Subproject commit e55e781c87fb1f08cfa6ecd650e20b8f63e06de3 diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config index 40ad2454..ff40b84e 100644 --- a/web/documentserver-example/csharp-mvc/web.appsettings.config +++ b/web/documentserver-example/csharp-mvc/web.appsettings.config @@ -17,7 +17,7 @@ - + diff --git a/web/documentserver-example/csharp/assets/document-formats b/web/documentserver-example/csharp/assets/document-formats index 898b1b32..e55e781c 160000 --- a/web/documentserver-example/csharp/assets/document-formats +++ b/web/documentserver-example/csharp/assets/document-formats @@ -1 +1 @@ -Subproject commit 898b1b32ac4e5a0cc084fab10c3ef664fb51b247 +Subproject commit e55e781c87fb1f08cfa6ecd650e20b8f63e06de3 diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index 45e45a81..7892369f 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -16,7 +16,7 @@ - + diff --git a/web/documentserver-example/go/config/configuration.json b/web/documentserver-example/go/config/configuration.json index 78e66905..abd352a7 100644 --- a/web/documentserver-example/go/config/configuration.json +++ b/web/documentserver-example/go/config/configuration.json @@ -67,6 +67,7 @@ "sv": "Swedish", "tr": "Turkish", "uk": "Ukrainian", + "ur": "Urdu", "vi": "Vietnamese", "aa-AA": "Test Language" } diff --git a/web/documentserver-example/go/static/assets/document-formats b/web/documentserver-example/go/static/assets/document-formats index 898b1b32..e55e781c 160000 --- a/web/documentserver-example/go/static/assets/document-formats +++ b/web/documentserver-example/go/static/assets/document-formats @@ -1 +1 @@ -Subproject commit 898b1b32ac4e5a0cc084fab10c3ef664fb51b247 +Subproject commit e55e781c87fb1f08cfa6ecd650e20b8f63e06de3 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 08903666..361c36bc 100755 --- a/web/documentserver-example/java-spring/src/main/resources/application.properties +++ b/web/documentserver-example/java-spring/src/main/resources/application.properties @@ -15,7 +15,7 @@ files.docservice.history.postfix=-hist files.docservice.url.example= -files.docservice.languages=en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language +files.docservice.languages=en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|ur:Urdu|vi:Vietnamese|aa-AA:Test Language docservice.url=http://documentserver/ docservice.ignoreSSLCertificate=false 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 898b1b32..e55e781c 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 898b1b32ac4e5a0cc084fab10c3ef664fb51b247 +Subproject commit e55e781c87fb1f08cfa6ecd650e20b8f63e06de3 diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties index 87f03147..276e176f 100644 --- a/web/documentserver-example/java/src/main/resources/settings.properties +++ b/web/documentserver-example/java/src/main/resources/settings.properties @@ -14,7 +14,7 @@ files.docservice.url.api=web-apps/apps/api/documents/api.js files.docservice.url.preloader=web-apps/apps/api/documents/preload.html files.docservice.url.example= -files.docservice.languages=en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language +files.docservice.languages=en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|ur:Urdu|vi:Vietnamese|aa-AA:Test Language files.docservice.secret= files.docservice.header=Authorization diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json index 1671a815..ffb62dd0 100644 --- a/web/documentserver-example/nodejs/config/default.json +++ b/web/documentserver-example/nodejs/config/default.json @@ -83,6 +83,7 @@ "sv": "Swedish", "tr": "Turkish", "uk": "Ukrainian", + "ur": "Urdu", "vi": "Vietnamese", "aa-AA": "Test Language" } diff --git a/web/documentserver-example/nodejs/helpers/wopi/tokenValidator.js b/web/documentserver-example/nodejs/helpers/wopi/tokenValidator.js index 61542859..70ca5f4d 100644 --- a/web/documentserver-example/nodejs/helpers/wopi/tokenValidator.js +++ b/web/documentserver-example/nodejs/helpers/wopi/tokenValidator.js @@ -32,7 +32,7 @@ exports.isValidToken = async (req, res, next) => { const isValid = wopiValidator.check( { - url: `${req.protocol}://${req.get('host')}${req.originalUrl || req.url}`, + url: `${req.DocManager.getServerPath()}${req.originalUrl || req.url}`, accessToken: req.query.access_token, timestamp: req.headers[reqConsts.requestHeaders.Timestamp.toLowerCase()], }, diff --git a/web/documentserver-example/nodejs/public/assets/document-formats b/web/documentserver-example/nodejs/public/assets/document-formats index 898b1b32..e55e781c 160000 --- a/web/documentserver-example/nodejs/public/assets/document-formats +++ b/web/documentserver-example/nodejs/public/assets/document-formats @@ -1 +1 @@ -Subproject commit 898b1b32ac4e5a0cc084fab10c3ef664fb51b247 +Subproject commit e55e781c87fb1f08cfa6ecd650e20b8f63e06de3 diff --git a/web/documentserver-example/nodejs/public/javascripts/jscript.js b/web/documentserver-example/nodejs/public/javascripts/jscript.js index d9c4438b..8c5338e8 100644 --- a/web/documentserver-example/nodejs/public/javascripts/jscript.js +++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js @@ -19,7 +19,7 @@ var language; var userid; var directUrl; -var formatManager; +var formatManager = new FormatManager(); window.onload = function () { fetch('formats') @@ -38,7 +38,12 @@ window.onload = function () { }); formatManager = new FormatManager(formats); } - }) + }); + + var urlScripts = jq("#loadScripts").attr("data-docs"); + var frame = ''; + jq("#loadScripts").html(frame); + jq("#loadScripts iframe").attr("src", urlScripts); } if (typeof jQuery != "undefined") { @@ -139,7 +144,7 @@ if (typeof jQuery != "undefined") { if (!formatManager.isAutoConvertible(posExt)) { jq("#step2").addClass("done").removeClass("current"); - loadScripts(); + onuploaded(); return; } @@ -199,35 +204,14 @@ if (typeof jQuery != "undefined") { checkConvert(filePass, fileType); } else { jq("#step2").addClass("done").removeClass("current"); - loadScripts(); + onuploaded(); } } }); }, 1000); }; - var loadScripts = function () { - if (!jq("#mainProgress").is(":visible")) { - return; - } - jq("#step3").addClass("current"); - - if (jq("#loadScripts").is(":empty")) { - var urlScripts = jq("#loadScripts").attr("data-docs"); - var frame = ''; - jq("#loadScripts").html(frame); - document.getElementById("iframeScripts").onload = onloadScripts; - jq("#loadScripts iframe").attr("src", urlScripts); - } else { - onloadScripts(); - } - }; - - var onloadScripts = function () { - if (!jq("#mainProgress").is(":visible")) { - return; - } - jq("#step3").addClass("done").removeClass("current"); + var onuploaded = function () { jq("#beginView, #beginEmbedded").removeClass("disable"); var fileName = jq("#hiddenFileName").val(); @@ -276,7 +260,7 @@ if (typeof jQuery != "undefined") { jq(document).on("click", "#skipPass", function () { jq("#blockPassword").hide(); - loadScripts(); + onuploaded(); }); jq(document).on("click", "#beginEdit:not(.disable)", function () { diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs index 2280970c..6b36f08d 100755 --- a/web/documentserver-example/nodejs/views/index.ejs +++ b/web/documentserver-example/nodejs/views/index.ejs @@ -322,10 +322,7 @@
- 3. Loading editor scripts. - They are loaded only once, they will be cached on your computer. -
Note the speed of all operations depends on your connection quality and server location.
diff --git a/web/documentserver-example/nodejs/views/wopiIndex.ejs b/web/documentserver-example/nodejs/views/wopiIndex.ejs index 2c94703a..2eebb15e 100755 --- a/web/documentserver-example/nodejs/views/wopiIndex.ejs +++ b/web/documentserver-example/nodejs/views/wopiIndex.ejs @@ -235,11 +235,7 @@
- 3. Loading editor scripts. - They are loaded only once, they will be cached on your computer. -
-
Note the speed of all operations depends on your connection quality and server location.

diff --git a/web/documentserver-example/php-laravel/app/Repositories/LanguageRepository.php b/web/documentserver-example/php-laravel/app/Repositories/LanguageRepository.php index 77607e37..51d57454 100644 --- a/web/documentserver-example/php-laravel/app/Repositories/LanguageRepository.php +++ b/web/documentserver-example/php-laravel/app/Repositories/LanguageRepository.php @@ -64,6 +64,7 @@ class LanguageRepository 'sv' => 'Swedish', 'tr' => 'Turkish', 'uk' => 'Ukrainian', + 'ur' => 'Urdu', 'vi' => 'Vietnamese', 'aa-AA' => 'Test Language', ]; diff --git a/web/documentserver-example/php/assets/document-formats b/web/documentserver-example/php/assets/document-formats index 898b1b32..e55e781c 160000 --- a/web/documentserver-example/php/assets/document-formats +++ b/web/documentserver-example/php/assets/document-formats @@ -1 +1 @@ -Subproject commit 898b1b32ac4e5a0cc084fab10c3ef664fb51b247 +Subproject commit e55e781c87fb1f08cfa6ecd650e20b8f63e06de3 diff --git a/web/documentserver-example/php/src/configuration/ConfigurationManager.php b/web/documentserver-example/php/src/configuration/ConfigurationManager.php index 3e3e4b90..e2a5c3df 100644 --- a/web/documentserver-example/php/src/configuration/ConfigurationManager.php +++ b/web/documentserver-example/php/src/configuration/ConfigurationManager.php @@ -222,6 +222,7 @@ class ConfigurationManager 'sv' => 'Swedish', 'tr' => 'Turkish', 'uk' => 'Ukrainian', + 'ur' => 'Urdu', 'vi' => 'Vietnamese', 'aa-AA' => 'Test Language' ]; diff --git a/web/documentserver-example/python/assets/document-formats b/web/documentserver-example/python/assets/document-formats index 898b1b32..e55e781c 160000 --- a/web/documentserver-example/python/assets/document-formats +++ b/web/documentserver-example/python/assets/document-formats @@ -1 +1 @@ -Subproject commit 898b1b32ac4e5a0cc084fab10c3ef664fb51b247 +Subproject commit e55e781c87fb1f08cfa6ecd650e20b8f63e06de3 diff --git a/web/documentserver-example/python/src/configuration/configuration.py b/web/documentserver-example/python/src/configuration/configuration.py index daf7f95c..bd07cd7e 100644 --- a/web/documentserver-example/python/src/configuration/configuration.py +++ b/web/documentserver-example/python/src/configuration/configuration.py @@ -173,6 +173,7 @@ class ConfigurationManager: 'sv': 'Swedish', 'tr': 'Turkish', 'uk': 'Ukrainian', + 'ur': 'Urdu', 'vi': 'Vietnamese', 'aa-AA': 'Test Language' } diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index 42d42d0e..6b53847d 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -198,6 +198,7 @@ class ConfigurationManager sv: 'Swedish', tr: 'Turkish', uk: 'Ukrainian', + ur: 'Urdu', vi: 'Vietnamese', 'aa-AA': 'Test Language' } diff --git a/web/documentserver-example/ruby/assets/document-formats b/web/documentserver-example/ruby/assets/document-formats index 898b1b32..e55e781c 160000 --- a/web/documentserver-example/ruby/assets/document-formats +++ b/web/documentserver-example/ruby/assets/document-formats @@ -1 +1 @@ -Subproject commit 898b1b32ac4e5a0cc084fab10c3ef664fb51b247 +Subproject commit e55e781c87fb1f08cfa6ecd650e20b8f63e06de3