Revert "fix: remove on develop pull request"

This reverts commit 2d9a7ed502.
Merge pull request #348 from ONLYOFFICE/feature/add-oform-parameter
2026-02-12 10:55:15 +08:00 · 2023-03-02 18:11:27 +05:00 · 2023-02-17 16:10:02 +05:00 · 2023-01-31 18:01:46 +05:00
7 changed files with 11 additions and 6 deletions
--- a/.github/workflows/lint-java.yml
+++ b/.github/workflows/lint-java.yml
@ -6,7 +6,7 @@ on:
    branches: [master, main]
    paths: ['web/documentserver-example/java/**']
  pull_request:
-    branches: [master, main]
+    branches: [master, main, develop]
    paths: ['web/documentserver-example/java/**']

 jobs:
--- a/.github/workflows/lint-nodejs.yml
+++ b/.github/workflows/lint-nodejs.yml
@ -6,7 +6,7 @@ on:
    branches: [master, main]
    paths: ['web/documentserver-example/nodejs/**']
  pull_request:
-    branches: [master, main]
+    branches: [master, main, develop]
    paths: ['web/documentserver-example/nodejs/**']

 env:
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@ -6,7 +6,7 @@ on:
    branches: [master, main]
    paths: ['web/documentserver-example/php/**']
  pull_request:
-    branches: [master, main]
+    branches: [master, main, develop]
    paths: ['web/documentserver-example/php/**']

 jobs:
--- a/.github/workflows/lint-python.yml
+++ b/.github/workflows/lint-python.yml
@ -6,7 +6,7 @@ on:
    branches: [master, main]
    paths: ['web/documentserver-example/python/**']
  pull_request:
-    branches: [master, main]
+    branches: [master, main, develop]
    paths: ['web/documentserver-example/python/**']

 jobs:
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@ -6,7 +6,7 @@ on:
    branches: [master, main]
    paths: ['web/documentserver-example/ruby/**']
  pull_request:
-    branches: [master, main]
+    branches: [master, main, develop]
    paths: ['web/documentserver-example/ruby/**']

 jobs:
--- a/.github/workflows/lint-spring.yml
+++ b/.github/workflows/lint-spring.yml
@ -6,7 +6,7 @@ on:
    branches: [master, main]
    paths: ['web/documentserver-example/java-spring/**']
  pull_request:
-    branches: [master, main]
+    branches: [master, main, develop]
    paths: ['web/documentserver-example/java-spring/**']

 jobs:
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@ -232,6 +232,11 @@
            config.events.onRequestSaveAs = onRequestSaveAs;
        }

+        if (new URL(window.location).searchParams.get("oform") == "false") {
+            config.document.options = config.document.options || {};
+            config.document.options["oform"] = false;
+        }
+
        var connectEditor = function () {

            if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
Author	SHA1	Message	Date
Sergey Linnik	33c093f7a6	Revert "fix: remove on develop pull request" This reverts commit `2d9a7ed502`.	2023-03-02 18:11:27 +05:00
Sergey Linnik	de9f27465f	Merge pull request #348 from ONLYOFFICE/feature/add-oform-parameter nodejs: disable oform module	2023-02-17 16:10:02 +05:00
KirillovIlya	b765d43612	nodejs: disable oform module	2023-01-31 18:01:46 +05:00