Merge branch release/v7.5.0 into master

ONLYOFFICE · Oct 17, 2023 · b26baed · b26baed
2 parents c2d39b1 + a311f41
commit b26baed
Show file tree

Hide file tree

Showing 50 changed files with 2,762 additions and 641 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,7 +3,7 @@ name: Bug Report
 about: Report an issue with build_tools you've discovered.
 ---
 
-**Describe your problem**:
+# Describe your problem:
 
 *Be clear in your description of the problem.
 Open an issue with a descriptive title and a summary in complete sentences.*

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -3,9 +3,12 @@ name: Markdown check
 on:
   workflow_dispatch:
   push:
+    branches:
+      - '*'
     paths:
       - '*.md'
       - 'develop/*.md'
+      - 'scripts/**.md'
 
 jobs:
   markdownlint:
@@ -14,5 +17,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: DavidAnson/markdownlint-cli2-action@v9
         with:
-          globs: '*.md,develop/*.md'
-          separator: ','
+          command: config
+          globs: |
+            .markdownlint.jsonc
+            *.md
+            develop/*.md
+            scripts/**.md
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,8 @@ config
 *.*~
 **~
 *.DS_Store
+scripts/license_checker/reports
+tests/puppeteer/node_modules
+tests/puppeteer/work_directory
+tests/puppeteer/package.json
+tests/puppeteer/package-lock.json
diff --git a/.markdownlint.jsonc b/.markdownlint.jsonc
@@ -0,0 +1,5 @@
+{
+  "line-length": {
+    "code_block_line_length": 300
+  }
+}
diff --git a/build.pro b/build.pro
@@ -8,6 +8,16 @@ include($$PWD/common.pri)
 
 CONFIG += ordered
 
+core:CONFIG += core_libraries
+builder:CONFIG += core_libraries
+desktop:CONFIG += core_libraries
+server:CONFIG += core_libraries
+mobile:CONFIG += core_libraries
+
+!core_libraries:CONFIG += no_x2t
+!core_libraries:CONFIG += no_use_common_binary
+!core_libraries:CONFIG += no_tests
+
 core_windows {
     desktop:CONFIG += core_and_multimedia
 }
@@ -28,34 +38,36 @@ core_android {
     CONFIG += no_tests
 }
 
-addSubProject(cryptopp,         $$CORE_ROOT_DIR/Common/3dParty/cryptopp/project/cryptopp.pro)
-addSubProject(cfcpp,            $$CORE_ROOT_DIR/Common/cfcpp/cfcpp.pro)
-addSubProject(unicodeconverter, $$CORE_ROOT_DIR/UnicodeConverter/UnicodeConverter.pro,\
-                                    cryptopp)
-addSubProject(kernel,           $$CORE_ROOT_DIR/Common/kernel.pro,\
-                                    unicodeconverter)
-addSubProject(network,          $$CORE_ROOT_DIR/Common/Network/network.pro,\
-                                    kernel unicodeconverter)
-addSubProject(graphics,         $$CORE_ROOT_DIR/DesktopEditor/graphics/pro/graphics.pro,\
-                                    kernel unicodeconverter)
-addSubProject(pdffile,          $$CORE_ROOT_DIR/PdfFile/PdfFile.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(djvufile,         $$CORE_ROOT_DIR/DjVuFile/DjVuFile.pro,\
-                                    kernel unicodeconverter graphics pdffile)
-addSubProject(xpsfile,          $$CORE_ROOT_DIR/XpsFile/XpsFile.pro,\
-                                    kernel unicodeconverter graphics pdffile)
-addSubProject(htmlrenderer,     $$CORE_ROOT_DIR/HtmlRenderer/htmlrenderer.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(docxrenderer,     $$CORE_ROOT_DIR/DocxRenderer/DocxRenderer.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(htmlfile2,        $$CORE_ROOT_DIR/HtmlFile2/HtmlFile2.pro,\
-                                    kernel unicodeconverter graphics network)
-addSubProject(doctrenderer,     $$CORE_ROOT_DIR/DesktopEditor/doctrenderer/doctrenderer.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(fb2file,          $$CORE_ROOT_DIR/Fb2File/Fb2File.pro,\
-                                    kernel unicodeconverter graphics)
-addSubProject(epubfile,         $$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\
-                                    kernel unicodeconverter graphics htmlfile2)
+core_libraries {
+    addSubProject(cryptopp,         $$CORE_ROOT_DIR/Common/3dParty/cryptopp/project/cryptopp.pro)
+    addSubProject(cfcpp,            $$CORE_ROOT_DIR/Common/cfcpp/cfcpp.pro)
+    addSubProject(unicodeconverter, $$CORE_ROOT_DIR/UnicodeConverter/UnicodeConverter.pro,\
+                                        cryptopp)
+    addSubProject(kernel,           $$CORE_ROOT_DIR/Common/kernel.pro,\
+                                        unicodeconverter)
+    addSubProject(network,          $$CORE_ROOT_DIR/Common/Network/network.pro,\
+                                        kernel unicodeconverter)
+    addSubProject(graphics,         $$CORE_ROOT_DIR/DesktopEditor/graphics/pro/graphics.pro,\
+                                        kernel unicodeconverter)
+    addSubProject(pdffile,          $$CORE_ROOT_DIR/PdfFile/PdfFile.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(djvufile,         $$CORE_ROOT_DIR/DjVuFile/DjVuFile.pro,\
+                                        kernel unicodeconverter graphics pdffile)
+    addSubProject(xpsfile,          $$CORE_ROOT_DIR/XpsFile/XpsFile.pro,\
+                                        kernel unicodeconverter graphics pdffile)
+    addSubProject(htmlrenderer,     $$CORE_ROOT_DIR/HtmlRenderer/htmlrenderer.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(docxrenderer,     $$CORE_ROOT_DIR/DocxRenderer/DocxRenderer.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(htmlfile2,        $$CORE_ROOT_DIR/HtmlFile2/HtmlFile2.pro,\
+                                        kernel unicodeconverter graphics network)
+    addSubProject(doctrenderer,     $$CORE_ROOT_DIR/DesktopEditor/doctrenderer/doctrenderer.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(fb2file,          $$CORE_ROOT_DIR/Fb2File/Fb2File.pro,\
+                                        kernel unicodeconverter graphics)
+    addSubProject(epubfile,         $$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\
+                                        kernel unicodeconverter graphics htmlfile2)
+}
 !no_x2t {
     addSubProject(docxformat,   $$CORE_ROOT_DIR/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro)
     addSubProject(pptxformat,   $$CORE_ROOT_DIR/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro)
@@ -85,11 +97,14 @@ addSubProject(epubfile,         $$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\
                                       kernel unicodeconverter graphics doctrenderer)
     addSubProject(pluginsmanager, $$CORE_ROOT_DIR/DesktopEditor/pluginsmanager/pluginsmanager.pro,\
                                       kernel)
+    addSubProject(vboxtester,     $$CORE_ROOT_DIR/DesktopEditor/vboxtester/vboxtester.pro,\
+                                      kernel)
 }
 
 !no_tests {
     addSubProject(standardtester,  $$CORE_ROOT_DIR/Test/Applications/StandardTester/standardtester.pro)
     addSubProject(x2ttester,       $$CORE_ROOT_DIR/Test/Applications/x2tTester/x2ttester.pro)
+    addSubProject(metafiletester,  $$CORE_ROOT_DIR/Test/Applications/MetafileTester/MetafileTester.pro)
 
     #TODO:
     !linux_arm64:addSubProject(ooxml_crypt, $$CORE_ROOT_DIR/OfficeCryptReader/ooxml_crypt/ooxml_crypt.pro)
@@ -128,3 +143,7 @@ mobile {
         addSubProject(hunspell, $$CORE_ROOT_DIR/Common/3dParty/hunspell/qt/hunspell.pro)
     }
 }
+
+osign {
+    addSubProject(osign, $$CORE_ROOT_DIR/DesktopEditor/xmlsec/src/osign/lib/osign.pro)
+}
diff --git a/defaults b/defaults
@@ -1,3 +1,3 @@
-sdkjs-plugin="photoeditor, macros, ocr, translator, thesaurus, youtube, highlightcode"
-sdkjs-plugin-server="speech, zotero, mendeley"
+sdkjs-plugin="photoeditor, macros, ocr, translator, thesaurus, youtube, highlightcode, drawio, zotero"
+sdkjs-plugin-server="speech, zotero, mendeley, speechrecognition"
 sdkjs-addons="sdkjs-forms"
diff --git a/develop/Dockerfile b/develop/Dockerfile
@@ -3,11 +3,17 @@ RUN apt-get update -y && \
 	apt-get install git -y \
 			python3 -y \
 			openjdk-11-jdk -y \
+			bzip2 -y \
 			npm -y && \
-			npm install -g grunt-cli -y && \
+	npm install -g grunt grunt-cli -y && \
 	ln -s /usr/bin/python3 /usr/bin/python && \
 	ln -s /usr/bin/pip3 /usr/bin/pip && \
 	git clone --depth 1 https://github.com/ONLYOFFICE/build_tools.git var/www/onlyoffice/documentserver/build_tools && \
 	sed -i '/documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER}/d' /app/ds/run-document-server.sh && \
+	#Set Up Debug Logging
+	sed -i 's/WARN/ALL/g' /etc/onlyoffice/documentserver/log4js/production.json && \
+	#Start test example
+	if [ -s /etc/supervisor/conf.d/ds-example.conf ] ; then sed -i 's,autostart=false,autostart=true,' /etc/supervisor/conf.d/ds-example.conf; fi && \
+	if [ -s /app/ds/setup/config/supervisor/ds/ds-example.conf ] ; then sed -i 's,autostart=false,autostart=true,' /app/ds/setup/config/supervisor/ds/ds-example.conf; fi && \
 	rm -rf /var/lib/apt/lists/*
-ENTRYPOINT python3 /var/www/onlyoffice/documentserver/build_tools/develop/run_build_js.py /var/www/onlyoffice/documentserver && /bin/sh -c /app/ds/run-document-server.sh 
+ENTRYPOINT python3 /var/www/onlyoffice/documentserver/build_tools/develop/run_build_js.py /var/www/onlyoffice/documentserver $@ && /bin/sh -c /app/ds/run-document-server.sh