Merge pull request #468 from ONLYOFFICE/release/1.7.0

Release/1.7.0
ONLYOFFICE · Oct 30, 2023 · 2459863 · 2459863
2 parents fcb8074 + 52c11fa
commit 2459863
Show file tree

Hide file tree

Showing 318 changed files with 14,130 additions and 5,851 deletions.
diff --git a/.github/workflows/artifact-csharp-mvc.yml b/.github/workflows/artifact-csharp-mvc.yml
@@ -21,11 +21,9 @@ jobs:
           cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/csharp-mvc
-          mkdir -p ./deploy/'DotNet (Csharp MVN) Example'
+          mkdir -p ./deploy/'DotNet (Csharp MVC) Example'
           rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example'
-          cd ./deploy/'DotNet (Csharp MVC) Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'DotNet (Csharp MVC) Example'/assets/.git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/artifact-csharp.yml b/.github/workflows/artifact-csharp.yml
@@ -18,14 +18,11 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/csharp
           mkdir -p ./deploy/'DotNet (Csharp) Example'
           rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp) Example'
-          cd ./deploy/'DotNet (Csharp) Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'DotNet (Csharp) Example'/assets/.git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/artifact-java.yml b/.github/workflows/artifact-java.yml
@@ -18,14 +18,12 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/java
           mkdir -p ./deploy/'Java Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Java Example'
-          cd ./deploy/'Java Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-formats/.git
+          rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-templates/.git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/artifact-node.yml b/.github/workflows/artifact-node.yml
@@ -18,14 +18,12 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/nodejs
           mkdir -p ./deploy/'Node.js Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Node.js Example'
-          cd ./deploy/'Node.js Example'/public/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'Node.js Example'/public/assets/document-formats/.git
+          rm -rf ./deploy/'Node.js Example'/public/assets/document-templates/.git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/artifact-php.yml b/.github/workflows/artifact-php.yml
@@ -18,14 +18,12 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/php
           mkdir -p ./deploy/'PHP Example'
           rsync -av --exclude='deploy' ./ ./deploy/'PHP Example'
-          cd ./deploy/'PHP Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'PHP Example'/assets/document-formats/.git
+          rm -rf ./deploy/'PHP Example'/assets/document-templates/.git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/artifact-python.yml b/.github/workflows/artifact-python.yml
@@ -18,14 +18,12 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/python
           mkdir -p ./deploy/'Python Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Python Example'
-          cd ./deploy/'Python Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'Python Example'/assets/document-formats/.git
+          rm -rf ./deploy/'Python Example'/assets/document-templates/.git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/artifact-ruby.yml b/.github/workflows/artifact-ruby.yml
@@ -18,14 +18,12 @@ jobs:
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
           git submodule update --init --recursive
           cd ./web/documentserver-example/ruby
           mkdir -p ./deploy/'Ruby Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Ruby Example'
-          cd ./deploy/'Ruby Example'/public/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'Ruby Example'/public/assets/document-formats/.git
+          rm -rf ./deploy/'Ruby Example'/public/assets/document-templates/.git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/artifact-spring.yml b/.github/workflows/artifact-spring.yml
@@ -23,9 +23,8 @@ jobs:
           cd ./web/documentserver-example/java-spring
           mkdir -p ./deploy/'Java Spring Example'
           rsync -av --exclude='deploy' ./ ./deploy/'Java Spring Example'
-          cd ./deploy/'Java Spring Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-formats/.git
+          rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-templates/.git
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
@@ -25,7 +25,5 @@ jobs:
           php-version: '8.2'
           tools: cs2pr, phpcs
 
-      - name: Run phpcs
-        run: |
-          phpcs --version
-          phpcs -q --extensions=php,module,inc,install,test,profile,theme,info --ignore=node_modules,bower_components,vendor,css,js,lib --standard=./ruleset.xml ./
+      - name: Lint
+        run: phpcs src index.php
diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml
@@ -32,9 +32,9 @@ jobs:
 
       - name: Lint Flake8
         run: |
-          flake8 ./**/*.py --count --select=E9,F63,F7,F82 --show-source --statistics
-          flake8 ./**/*.py --count --max-complexity=10 --max-line-length=79 --statistics
+          flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
+          flake8 --count --max-complexity=10 --max-line-length=79 --statistics
           
       - name: Lint Pylint
         run: |
-          pylint ./**/*.py
+          find . -type f -name "*.py" | xargs pylint 
diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml
@@ -16,16 +16,22 @@ jobs:
       run:
         working-directory: ./web/documentserver-example/ruby
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-          bundler-cache: true
-      - name: Install dependencies
-        run: | 
-          bundle install
-      - name: Rubocop
-        run: |
-          gem install rubocop
-          rubocop
+    - name: Checkout Repository
+      uses: actions/checkout@v3
+
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.2.2'
+
+    - name: Update Submodules
+      run: |
+        git submodule update --init --recursive
+
+    - name: Install Dependencies
+      run: |
+        bundle update
+
+    - name: Rubocop
+      run: |
+        bundle exec rubocop
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,8 +13,10 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-      - name: Install Zip
-        run: sudo apt-get install zip
+      - name: Clone Submodules
+        run: |
+          cd ${{ github.workspace }}
+          git submodule update --init --recursive
       - name: Get Info
         run: |
           echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT
@@ -25,91 +27,66 @@ jobs:
       - name: Build Csharp MVC Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
           cd ./web/documentserver-example/csharp-mvc
           mkdir -p ./'DotNet (Csharp MVC) Example'
           rsync -av --exclude='DotNet (Csharp MVC) Example' ./ ./'DotNet (Csharp MVC) Example'
           cd ./'DotNet (Csharp MVC) Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf .git
       - name: Build Csharp Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
           cd ./web/documentserver-example/csharp
           mkdir -p ./'DotNet (Csharp) Example'
           rsync -av --exclude='DotNet (Csharp) Example' ./ ./'DotNet (Csharp) Example'
-          cd ./'DotNet (Csharp) Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./'DotNet (Csharp) Example'/assets/.git
       - name: Build Java Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
           cd ./web/documentserver-example/java
           mkdir -p ./'Java Example'
           rsync -av --exclude='Java Example' ./ ./'Java Example'
-          cd ./'Java Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./'Java Example'/src/main/resources/assets/document-formats/.git
+          rm -rf ./'Java Example'/src/main/resources/assets/document-templates/.git
       - name: Build Nodejs Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
           cd ./web/documentserver-example/nodejs
           mkdir -p ./'Node.js Example'
           rsync -av --exclude='Node.js Example' ./ ./'Node.js Example'
-          cd ./'Node.js Example'/public/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./'Node.js Example'/public/assets/document-formats/.git
+          rm -rf ./'Node.js Example'/public/assets/document-templates/.git
       - name: Build PHP Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
           cd ./web/documentserver-example/php
           mkdir -p ./'PHP Example'
           rsync -av --exclude='PHP Example' ./ ./'PHP Example'
-          cd ./'PHP Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./'PHP Example'/assets/document-formats/.git
+          rm -rf ./'PHP Example'/assets/document-templates/.git
       - name: Build Python Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
           cd ./web/documentserver-example/python
           mkdir -p ./'Python Example'
           rsync -av --exclude='Python Example' ./ ./'Python Example'
-          cd ./'Python Example'/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./'Python Example'/assets/document-formats/.git
+          rm -rf ./'Python Example'/assets/document-templates/.git
       - name: Build Ruby Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
           cd ./web/documentserver-example/ruby
           mkdir -p ./'Ruby Example'
           rsync -av --exclude='Ruby Example' ./ ./'Ruby Example'
-          cd ./'Ruby Example'/public/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./'Ruby Example'/public/assets/document-formats/.git
+          rm -rf ./'Ruby Example'/public/assets/document-templates/.git
       - name: Build Spring Artifact
         run: |
           cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
           cd ./web/documentserver-example/java-spring
           mkdir -p ./'Java Spring Example'
           rsync -av --exclude='Java Spring Example' ./ ./'Java Spring Example'
-          cd ./'Java Spring Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
+          rm -rf ./'Java Spring Example'/src/main/resources/assets/document-formats/.git
+          rm -rf ./'Java Spring Example'/src/main/resources/assets/document-templates/.git
       - name: Pack Artifacts
         run: |
           cd ${{ github.workspace }}/web/documentserver-example/csharp-mvc

diff --git a/.gitignore b/.gitignore
@@ -22,8 +22,3 @@
 /web/documentserver-example/csharp/packages
 /web/documentserver-example/csharp-mvc/packages
 /web/documentserver-example/java-spring/documents/
-/web/documentserver-example/ruby/.bundle
-/web/documentserver-example/ruby/db/*.sqlite3
-/web/documentserver-example/ruby/db/*.sqlite3-journal
-/web/documentserver-example/ruby/log/*
-/web/documentserver-example/ruby/tmp
diff --git a/.gitmodules b/.gitmodules
@@ -1,32 +1,48 @@
-[submodule "web/documentserver-example/nodejs/public/assets"]
-	path = web/documentserver-example/nodejs/public/assets
+[submodule "web/documentserver-example/csharp-mvc/assets"]
+	path = web/documentserver-example/csharp-mvc/assets
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/java/src/main/resources/assets"]
-	path = web/documentserver-example/java/src/main/resources/assets
+[submodule "web/documentserver-example/csharp/assets"]
+	path = web/documentserver-example/csharp/assets
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/php/assets"]
-	path = web/documentserver-example/php/assets
+[submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
+	path = web/documentserver-example/nodejs/public/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/python/assets"]
-	path = web/documentserver-example/python/assets
+[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 = master
+[submodule "web/documentserver-example/php/assets/document-templates"]
+	path = web/documentserver-example/php/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/csharp-mvc/assets"]
-	path = web/documentserver-example/csharp-mvc/assets
+[submodule "web/documentserver-example/php/assets/document-formats"]
+	path = web/documentserver-example/php/assets/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats
+	branch = master
+[submodule "web/documentserver-example/python/assets/document-templates"]
+	path = web/documentserver-example/python/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/csharp/assets"]
-	path = web/documentserver-example/csharp/assets
+[submodule "web/documentserver-example/java/src/main/resources/assets/document-templates"]
+	path = web/documentserver-example/java/src/main/resources/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/ruby/public/assets"]
-	path = web/documentserver-example/ruby/public/assets
+[submodule "web/documentserver-example/ruby/assets/document-templates"]
+	path = web/documentserver-example/ruby/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/java-spring/src/main/resources/assets"]
-	path = web/documentserver-example/java-spring/src/main/resources/assets
+[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-templates"]
+	path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
+[submodule "web/documentserver-example/python/assets/document-formats"]
+	path = web/documentserver-example/python/assets/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats
+	branch = master
+[submodule "web/documentserver-example/ruby/assets/document-formats"]
+	path = web/documentserver-example/ruby/assets/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats
+	branch = master