Merge pull request #579 from ONLYOFFICE/release/v1.9.0

Release/1.9.0
nodejs: formats v2.0.0
2026-03-20 23:11:34 +08:00 · 2024-07-02 10:20:10 +03:00 · 2024-06-24 12:32:45 +03:00 · 2024-06-20 13:23:45 +03:00 · 2024-06-20 13:20:27 +03:00 · 2024-06-20 11:36:46 +03:00
30 changed files with 68 additions and 44 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -5,7 +5,6 @@
 [submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
 	path = web/documentserver-example/nodejs/public/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = feature/v8.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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,15 +1,21 @@
 # Change Log

- fill permission in embedded mode
+## 1.9.0
+- nodejs: filling by default
+- nodejs: docxf, oform as pdf documentType
+- nodejs: creating and editing pdf instead docxf
 - nodejs: wopi formsubmit icon
 - nodejs: close editor
+- en-GB, sr-Cyrl-RS skin languages
+- switching from filling to editing
+- fill permission in embedded mode

 ## 1.8.0
 - nodejs: pdf, djvu, xps, oxps as pdf documentType
 - nodejs: filling pdf
 - version number to page meta
 - ar skin languages
- sr-Latn-CS skin languages
+- sr-Latn-RS skin languages
 - getting history via api
 - using a repo with a list of formats
 - convert after uploading only tagged formats
--- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
@ -68,7 +68,7 @@

        // the user is trying to switch the document from the viewing into the editing mode
        var onRequestEditRights = function () {
-            location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), "");
+            location.href = location.href.replace(RegExp("editorsMode=\\w+\&?", "i"), "") + "&editorsMode=edit";
        };

        // an error or some other specific event occurs
--- a/web/documentserver-example/csharp-mvc/web.appsettings.config
+++ b/web/documentserver-example/csharp-mvc/web.appsettings.config
@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <appSettings>
  <clear />
-  <add key="version" value="1.8.0"/>
+  <add key="version" value="1.9.0"/>

  <add key="filesize-max" value="52428800"/>
  <add key="storage-path" value=""/>
@ -15,7 +15,7 @@

  <add key="files.docservice.verify-peer-off" value="true"/>

-  <add key="files.docservice.languages" value="en:English|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|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|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-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
+  <add key="files.docservice.languages" value="en:English|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|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"/>

  <add key="files.docservice.url.site" value="http://documentserver/"/>

--- a/web/documentserver-example/csharp/DocEditor.aspx
+++ b/web/documentserver-example/csharp/DocEditor.aspx
@ -86,7 +86,7 @@

        // the user is trying to switch the document from the viewing into the editing mode
        var onRequestEditRights = function () {
-            location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), "");
+            location.href = location.href.replace(RegExp("editorsMode=\\w+\&?", "i"), "") + "&editorsMode=edit";
        };

        // an error or some other specific event occurs
--- a/web/documentserver-example/csharp/settings.config
+++ b/web/documentserver-example/csharp/settings.config
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
  <clear />
-  <add key="version" value="1.8.0"/>
+  <add key="version" value="1.9.0"/>

  <add key="filesize-max" value="52428800"/>
  <add key="storage-path" value=""/>
@ -14,7 +14,7 @@

  <add key="files.docservice.token.useforrequest" value="true" />

-  <add key="files.docservice.languages" value="en:English|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|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|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-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
+  <add key="files.docservice.languages" value="en:English|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|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"/>

  <add key="files.docservice.url.site" value="http://documentserver/"/>

--- 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.8.0
+server.version=1.9.0

 server.address=
 server.port=4000
@ -25,7 +25,7 @@ files.docservice.token-use-for-request=true

 files.docservice.verify-peer-off=true

-files.docservice.languages=en:English|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|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|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-Latn-CS:Serbian|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|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|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

 spring.datasource.url=jdbc:h2:mem:usersdb
 spring.datasource.driverClassName=org.h2.Driver
--- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
@ -52,7 +52,7 @@

                // the user is trying to switch the document from the viewing into the editing mode
                var onRequestEditRights = function () {
-                    location.href = location.href.replace(RegExp("\&?action=view", "i"), "");
+                    location.href = location.href.replace(RegExp("\&?action=\\w+", "i"), "") + "&action=edit";
                };

                // an error or some other specific event occurs
--- 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.8.0
+version=1.9.0

 filesize-max=5242880
 storage-folder=app_data
@ -13,7 +13,7 @@ files.docservice.url.api=web-apps/apps/api/documents/api.js
 files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html
 files.docservice.url.example=

-files.docservice.languages=en:English|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|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|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-Latn-CS:Serbian|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|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|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.secret=
 files.docservice.header=Authorization
--- a/web/documentserver-example/java/src/main/webapp/editor.jsp
+++ b/web/documentserver-example/java/src/main/webapp/editor.jsp
@ -58,7 +58,7 @@

        // the user is trying to switch the document from the viewing into the editing mode
        var onRequestEditRights = function () {
-            location.href = location.href.replace(RegExp("mode=view\&?", "i"), "");
+            location.href = location.href.replace(RegExp("mode=\\w+\&?", "i"), "") + "&mode=edit";
        };

        // an error or some other specific event occurs
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@ -984,7 +984,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
      const fName = req.DocManager.createDemo(!!req.query.sample, fileExt, userid, name, false);

      // get the redirect path
-      const redirectPath = `${req.DocManager.getServerUrl()}/editor?fileName=`
+      const redirectPath = `${req.DocManager.getServerUrl()}/editor?mode=edit&fileName=`
      + `${encodeURIComponent(fName)}${req.DocManager.getCustomParams()}`;
      res.redirect(redirectPath);
      return;
@ -999,11 +999,14 @@ app.get('/editor', (req, res) => { // define a handler for editing document
    const key = req.DocManager.getKey(fileName);
    const url = req.DocManager.getDownloadUrl(fileName, true);
    const directUrl = req.DocManager.getDownloadUrl(fileName);
-    let mode = req.query.mode || 'edit'; // mode: view/edit/review/comment/fillForms/embedded
+
+    // check if this file can be filled
+    const canFill = fileUtility.getFillExtensions().indexOf(fileExt.slice(1)) !== -1;
+    let mode = req.query.mode || (canFill ? 'fillForms' : 'edit'); // mode: view/edit/review/comment/fillForms/embedded

    let canEdit = fileUtility.getEditExtensions().indexOf(fileExt.slice(1)) !== -1; // check if this file can be edited
    if (((!canEdit && mode === 'edit') || mode === 'fillForms')
-      && fileUtility.getFillExtensions().indexOf(fileExt.slice(1)) !== -1) {
+      && canFill) {
      mode = 'fillForms';
      canEdit = true;
    }
@ -1012,7 +1015,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
    }

    let submitForm = false;
-    if (mode === 'fillForms') {
+    if (mode === 'fillForms' || mode === 'embedded') {
      submitForm = userid === 'uid-1';
    }

--- a/web/documentserver-example/nodejs/config/default.json
+++ b/web/documentserver-example/nodejs/config/default.json
@ -1,5 +1,5 @@
 {
-  "version": "1.8.0",
+  "version": "1.9.0",
  "log": {
    "appenders": [
      {
@ -51,6 +51,7 @@
      "cs": "Czech",
      "da": "Danish",
      "nl": "Dutch",
+      "en-GB": "English (United Kingdom)",
      "fi": "Finnish",
      "fr": "French",
      "gl": "Galego",
@ -70,7 +71,8 @@
      "pt-PT": "Portuguese (Portugal)",
      "ro": "Romanian",
      "ru": "Russian",
-      "sr-Latn-CS": "Serbian",
+      "sr-Cyrl-RS": "Serbian (Cyrillic)",
+      "sr-Latn-RS": "Serbian (Latin)",
      "si": "Sinhala (Sri Lanka)",
      "sk": "Slovak",
      "sl": "Slovenian",
--- a/web/documentserver-example/nodejs/public/assets/document-formats
+++ b/web/documentserver-example/nodejs/public/assets/document-formats
--- a/web/documentserver-example/nodejs/public/assets/document-templates
+++ b/web/documentserver-example/nodejs/public/assets/document-templates
--- a/web/documentserver-example/nodejs/public/images/file_docxf.svg
+++ b/web/documentserver-example/nodejs/public/images/file_docxf.svg
@ -1 +0,0 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>
--- a/web/documentserver-example/nodejs/public/images/file_pdf.svg
+++ b/web/documentserver-example/nodejs/public/images/file_pdf.svg
@ -0,0 +1,5 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H23L30 7V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#9E1919"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0062 15V16.0065H24V15H17.0062ZM17.0062 19V20.0163H24V19H17.0062ZM24 23H17.0062V24.0261H24V23ZM6 28V27.0293H24V28H6ZM7 16H14V23H7V16ZM6 15H7H14H15V16V23V24H14H7H6V23V16V15Z" fill="white"/>
+<path d="M23 0L30 7H26C24.3431 7 23 5.65685 23 4V0Z" fill="black" fill-opacity="0.25"/>
+</svg>
--- a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
@ -162,7 +162,7 @@ label .checkbox {
 }

 .try-editor.form {
-    background-image: url("../images/file_docxf.svg");
+    background-image: url("../images/file_pdf.svg");
 }

 .side-option {
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@ -74,7 +74,7 @@
        };

        var onRequestEditRights = function () {  // the user is trying to switch the document from the viewing into the editing mode
-            location.href = location.href.replace(RegExp("mode=view\&?", "i"), "");
+            location.href = location.href.replace(RegExp("mode=\\w+\&?", "i"), "") + "&mode=edit";
        };

        var onRequestHistory = function (event) {  // the user is trying to show the document version history
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@ -58,7 +58,7 @@
                                            <a class="try-editor slide reload-page action-link" target="_blank" href="editor?fileExt=pptx" title="Create new presentation">Presentation</a>
                                        </li>
                                        <li>
-                                            <a class="try-editor form reload-page action-link" target="_blank" href="editor?fileExt=docxf" title="Create new PDF form">PDF form</a>
+                                            <a class="try-editor form reload-page action-link" target="_blank" href="editor?fileExt=pdf" title="Create new PDF form">PDF form</a>
                                        </li>
                                    </ul>
                                    <label class="side-option">
@ -161,13 +161,17 @@
                                                    </td>
                                                    <% if (storedFiles[i].canEdit) { %>
                                                        <td class="contentCells contentCells-icon">
-                                                            <a class="action-link" href="editor?type=desktop&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank">
+                                                            <a class="action-link" href="editor?type=desktop&mode=edit&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank">
                                                                <img src="images/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens" /></a>
                                                        </td>
+                                                        <% if (storedFiles[i].documentType !== "pdf") { %>
                                                        <td class="contentCells contentCells-icon">
                                                            <a class="action-link" href="editor?type=desktop&mode=comment&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank">
                                                                <img src="images/comment.svg" alt="Open in editor for comment" title="Open in editor for comment" /></a>
                                                        </td>
+                                                        <% } else { %>
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                        <% } %>
                                                        <% if (storedFiles[i].documentType == "word") { %>
                                                            <td class="contentCells contentCells-icon">
                                                                <a class="action-link" href="editor?type=desktop&mode=review&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank">
--- a/web/documentserver-example/nodejs/views/wopiIndex.ejs
+++ b/web/documentserver-example/nodejs/views/wopiIndex.ejs
@ -60,7 +60,7 @@
                                            <a class="try-editor slide reload-page action-link" target="_blank" href="wopi-new?fileExt=pptx" title="Create new presentation">Presentation</a>
                                        </li>
                                        <li>
-                                            <a class="try-editor form reload-page action-link" target="_blank" href="wopi-new?fileExt=docxf" title="Create new PDF form">PDF form</a>
+                                            <a class="try-editor form reload-page action-link" target="_blank" href="wopi-new?fileExt=pdf" title="Create new PDF form">PDF form</a>
                                        </li>
                                    </ul>
                                </div>
--- 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.8.0';
+    public string $version = '1.9.0';

    public function getVersion(): string
    {
@ -176,6 +176,7 @@ class ConfigurationManager
            'cs' => 'Czech',
            'da' => 'Danish',
            'nl' => 'Dutch',
+            'en-GB' => 'English (United Kingdom)',
            'fi' => 'Finnish',
            'fr' => 'French',
            'gl' => 'Galego',
@ -195,7 +196,8 @@ class ConfigurationManager
            'pt-PT' => 'Portuguese (Portugal)',
            'ro' => 'Romanian',
            'ru' => 'Russian',
-            'sr-Latn-CS' => 'Serbian',
+            'sr-Cyrl-RS' => 'Serbian (Cyrillic)',
+            'sr-Latn-RS' => 'Serbian (Latin)',
            'si' => 'Sinhala (Sri Lanka)',
            'sk' => 'Slovak',
            'sl' => 'Slovenian',
--- a/web/documentserver-example/php/templates/docEditor.tpl
+++ b/web/documentserver-example/php/templates/docEditor.tpl
@ -67,7 +67,7 @@

        // the user is trying to switch the document from the viewing into the editing mode
        var onRequestEditRights = function () {
-            location.href = location.href.replace(RegExp("action=view\&?", "i"), "");
+            location.href = location.href.replace(RegExp("action=\\w+\&?", "i"), "") + "&action=edit";
        };

        // an error or some other specific event occurs
--- a/web/documentserver-example/python/Dockerfile
+++ b/web/documentserver-example/python/Dockerfile
@ -13,7 +13,7 @@ CMD ["make", "server-dev"]

 FROM example-base AS example-prod
 RUN make prod
-CMD ["make", "server-prod"]
+CMD ["make", "server-dev"]

 FROM nginx:1.23.4-alpine3.17 AS proxy
 COPY proxy/nginx.conf /etc/nginx/nginx.conf
--- a/web/documentserver-example/python/pyproject.toml
+++ b/web/documentserver-example/python/pyproject.toml
@ -25,7 +25,7 @@ email = "support@onlyoffice.com"

 [project.optional-dependencies]
 development = [
-	"flake8>=6.0.0",
+	"flake8==7.1.0",
 	"mypy>=1.4.1",
 	"types-requests>=2.31.0"
 ]
--- 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.8.0'
+    version = '1.9.0'

    def getVersion(self) -> str:
        return self.version
@ -136,6 +136,7 @@ class ConfigurationManager:
            'cs': 'Czech',
            'da': 'Danish',
            'nl': 'Dutch',
+            'en-GB': 'English (United Kingdom)',
            'fi': 'Finnish',
            'fr': 'French',
            'gl': 'Galego',
@ -155,7 +156,8 @@ class ConfigurationManager:
            'pt-PT': 'Portuguese (Portugal)',
            'ro': 'Romanian',
            'ru': 'Russian',
-            'sr-Latn-CS': 'Serbian',
+            'sr-Cyrl-RS': 'Serbian (Cyrillic)',
+            'sr-Latn-RS': 'Serbian (Latin)',
            'si': 'Sinhala (Sri Lanka)',
            'sk': 'Slovak',
            'sl': 'Slovenian',
--- a/web/documentserver-example/python/src/views/actions.py
+++ b/web/documentserver-example/python/src/views/actions.py
@ -265,14 +265,14 @@ def edit(request):
            'key': docKey,
            'info': infObj,
            'permissions': {  # the permission for the document to be edited and downloaded or not
-                'comment': (edMode != 'view') & (edMode != 'fillForms') & (edMode != 'embedded') \
+                'comment': (edMode != 'view') & (edMode != 'fillForms') & (edMode != 'embedded')
                & (edMode != "blockcontent"),
                'copy': 'copy' not in user.deniedPermissions,
                'download': 'download' not in user.deniedPermissions,
-                'edit': canEdit & ((edMode == 'edit') | (edMode == 'view') | (edMode == 'filter') \
+                'edit': canEdit & ((edMode == 'edit') | (edMode == 'view') | (edMode == 'filter')
                                   | (edMode == "blockcontent")),
                'print': 'print' not in user.deniedPermissions,
-                'fillForms': (edMode != 'view') & (edMode != 'comment') \
+                'fillForms': (edMode != 'view') & (edMode != 'comment')
                & (edMode != "blockcontent"),
                'modifyFilter': edMode != 'filter',
                'modifyContentControl': edMode != "blockcontent",
--- a/web/documentserver-example/python/templates/editor.html
+++ b/web/documentserver-example/python/templates/editor.html
@ -64,7 +64,7 @@

        // the user is trying to switch the document from the viewing into the editing mode
        var onRequestEditRights = function () {
-            location.href = location.href.replace(RegExp("mode=view\&?", "i"), "");
+            location.href = location.href.replace(RegExp("mode=\\w+\&?", "i"), "") + "&mode=edit";
        };

        // an error or some other specific event occurs
--- a/web/documentserver-example/ruby/Dockerfile
+++ b/web/documentserver-example/ruby/Dockerfile
@ -16,7 +16,7 @@ RUN make dev
 CMD ["make", "server-dev"]

 FROM example-base AS example-prod
-RUN make prod
+RUN make dev
 CMD ["make", "server-prod"]

 FROM nginx:1.23.4-alpine3.17 AS proxy
--- 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.8.0'
+    @version = '1.9.0'
  end

  sig { returns(T.nilable(URI::Generic)) }
@ -154,6 +154,7 @@ class ConfigurationManager
      cs: 'Czech',
      da: 'Danish',
      nl: 'Dutch',
+      'en-GB': 'English (United Kingdom)',
      fi: 'Finnish',
      fr: 'French',
      gl: 'Galego',
@ -173,7 +174,8 @@ class ConfigurationManager
      'pt-PT': 'Portuguese (Portugal)',
      ro: 'Romanian',
      ru: 'Russian',
-      'sr-Latn-CS': 'Serbian',
+      'sr-Cyrl-RS': 'Serbian (Cyrillic)',
+      'sr-Latn-RS': 'Serbian (Latin)',
      si: 'Sinhala (Sri Lanka)',
      sk: 'Slovak',
      sl: 'Slovenian',
--- a/web/documentserver-example/ruby/app/views/home/editor.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb
@ -49,7 +49,7 @@

    // the user is trying to switch the document from the viewing into the editing mode
    var onRequestEditRights = function () {
-        location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), "");
+        location.href = location.href.replace(RegExp("editorsMode=\\w+\&?", "i"), "") + "&editorsMode=edit";
    };

    // an error or some other specific event occurs
Author	SHA1	Message	Date
Sergey Linnik	b36388124d	Merge pull request #579 from ONLYOFFICE/release/v1.9.0 Release/1.9.0	2024-07-02 10:20:10 +03:00
Sergey Linnik	052f73e47f	nodejs: formats v2.0.0	2024-06-24 12:32:45 +03:00
Sergey Linnik	b06c872a4c	Merge pull request #578 from ONLYOFFICE/fix/python-linter update and fixate flake8 version in python example	2024-06-20 13:23:45 +03:00
sshakndr	ce846f489b	build(python): update and fixate flake8 version	2024-06-20 13:20:27 +03:00
Sergey Linnik	7a5fdc9821	Merge pull request #542 from ONLYOFFICE/fix/compose-prod ( Fix Bug 68727 ) Fix/compose prod	2024-06-20 11:36:46 +03:00
sshakndr	fe50a6f1ab	fix(python): starting server on localhost in prod container	2024-06-20 11:34:47 +03:00
sshakndr	8268b633c7	fix(ruby): installing dev dependencies in prod container	2024-06-20 11:34:46 +03:00
Sergey Linnik	93c723eb47	nodejs: fix lint	2024-06-14 13:37:33 +03:00
Sergey Linnik	8cc0580310	nodejs: fix comment collumn (`146d26c868`)	2024-06-14 11:03:58 +03:00
Sergey Linnik	8c44f4a653	nodejs: switch back templates branch	2024-06-07 12:18:01 +03:00
Sergey Linnik	d6309505ff	1.9.0	2024-06-07 09:43:21 +03:00
Sergey Linnik	8207aec7a5	sr-Cyrl-RS skin language # Conflicts: # CHANGELOG.md	2024-06-06 17:26:17 +03:00
Sergey Linnik	a5fa0096e8	en-GB skin language # Conflicts: # CHANGELOG.md	2024-06-06 17:25:51 +03:00
Sergey Linnik	0c886264ba	fix sr-Latn-RS # Conflicts: # CHANGELOG.md # web/documentserver-example/csharp-mvc/web.appsettings.config # web/documentserver-example/csharp/settings.config # web/documentserver-example/java-spring/src/main/resources/application.properties # web/documentserver-example/java/src/main/resources/settings.properties	2024-06-06 17:25:23 +03:00
Sergey Linnik	871b08018f	filling to changelog	2024-06-06 14:53:00 +03:00
Sergey Linnik	4238de80cc	nodejs: update pdf icon	2024-05-20 14:10:03 +03:00
Sergey Linnik	146d26c868	nodejs: comment only is not for pdf	2024-05-20 13:56:06 +03:00
Sergey Linnik	ecb520e4cb	nodejs: submitting in embedded mode	2024-05-20 13:44:54 +03:00
Sergey Linnik	26673ec668	docxf, oform as pdf documentType	2024-04-23 11:26:16 +03:00
Sergey Linnik	fa303e9bf2	switching from filling to editing	2024-04-15 16:32:44 +03:00
Sergey Linnik	c55142bd73	Merge remote-tracking branch 'remotes/origin/feature/create-pdf' into release/v8.1.0	2024-03-21 16:06:24 +03:00
Sergey Linnik	6c03b145e2	nodejs: editing pdf form	2024-03-21 15:24:47 +03:00
Sergey Linnik	15e09fece2	nodejs: filling by default if possible	2024-03-21 15:23:57 +03:00
Sergey Linnik	abf382a03b	nodejs: creating pdf form	2024-03-21 15:03:13 +03:00
				`@ -1 +0,0 @@`
				`<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>`