Skip to content

Commit 2459863

Browse files
LinneySLinneyS
authored
Merge pull request #468 from ONLYOFFICE/release/1.7.0
Release/1.7.0
2 parents fcb8074 + 52c11fa commit 2459863

File tree

318 files changed

+14130
-5851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+14130
-5851
lines changed

‎.github/workflows/artifact-csharp-mvc.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ jobs:
2121
cwd=$(pwd)
2222
git submodule update --init --recursive
2323
cd ./web/documentserver-example/csharp-mvc
24-
mkdir -p ./deploy/'DotNet (Csharp MVN) Example'
24+
mkdir -p ./deploy/'DotNet (Csharp MVC) Example'
2525
rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example'
26-
cd ./deploy/'DotNet (Csharp MVC) Example'/assets
27-
rm -rf ./.git/
28-
rm .git
26+
rm -rf ./deploy/'DotNet (Csharp MVC) Example'/assets/.git
2927
- name: Upload Artifact
3028
uses: actions/upload-artifact@v3
3129
with:

‎.github/workflows/artifact-csharp.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ jobs:
1818
- name: Build Artifact
1919
run: |
2020
cd ${{ github.workspace }}
21-
cwd=$(pwd)
2221
git submodule update --init --recursive
2322
cd ./web/documentserver-example/csharp
2423
mkdir -p ./deploy/'DotNet (Csharp) Example'
2524
rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp) Example'
26-
cd ./deploy/'DotNet (Csharp) Example'/assets
27-
rm -rf ./.git/
28-
rm .git
25+
rm -rf ./deploy/'DotNet (Csharp) Example'/assets/.git
2926
- name: Upload Artifact
3027
uses: actions/upload-artifact@v3
3128
with:

‎.github/workflows/artifact-java.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ jobs:
1818
- name: Build Artifact
1919
run: |
2020
cd ${{ github.workspace }}
21-
cwd=$(pwd)
2221
git submodule update --init --recursive
2322
cd ./web/documentserver-example/java
2423
mkdir -p ./deploy/'Java Example'
2524
rsync -av --exclude='deploy' ./ ./deploy/'Java Example'
26-
cd ./deploy/'Java Example'/src/main/resources/assets
27-
rm -rf ./.git/
28-
rm .git
25+
rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-formats/.git
26+
rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-templates/.git
2927
- name: Upload Artifact
3028
uses: actions/upload-artifact@v3
3129
with:

‎.github/workflows/artifact-node.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ jobs:
1818
- name: Build Artifact
1919
run: |
2020
cd ${{ github.workspace }}
21-
cwd=$(pwd)
2221
git submodule update --init --recursive
2322
cd ./web/documentserver-example/nodejs
2423
mkdir -p ./deploy/'Node.js Example'
2524
rsync -av --exclude='deploy' ./ ./deploy/'Node.js Example'
26-
cd ./deploy/'Node.js Example'/public/assets
27-
rm -rf ./.git/
28-
rm .git
25+
rm -rf ./deploy/'Node.js Example'/public/assets/document-formats/.git
26+
rm -rf ./deploy/'Node.js Example'/public/assets/document-templates/.git
2927
- name: Upload Artifact
3028
uses: actions/upload-artifact@v3
3129
with:

‎.github/workflows/artifact-php.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ jobs:
1818
- name: Build Artifact
1919
run: |
2020
cd ${{ github.workspace }}
21-
cwd=$(pwd)
2221
git submodule update --init --recursive
2322
cd ./web/documentserver-example/php
2423
mkdir -p ./deploy/'PHP Example'
2524
rsync -av --exclude='deploy' ./ ./deploy/'PHP Example'
26-
cd ./deploy/'PHP Example'/assets
27-
rm -rf ./.git/
28-
rm .git
25+
rm -rf ./deploy/'PHP Example'/assets/document-formats/.git
26+
rm -rf ./deploy/'PHP Example'/assets/document-templates/.git
2927
- name: Upload Artifact
3028
uses: actions/upload-artifact@v3
3129
with:

‎.github/workflows/artifact-python.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ jobs:
1818
- name: Build Artifact
1919
run: |
2020
cd ${{ github.workspace }}
21-
cwd=$(pwd)
2221
git submodule update --init --recursive
2322
cd ./web/documentserver-example/python
2423
mkdir -p ./deploy/'Python Example'
2524
rsync -av --exclude='deploy' ./ ./deploy/'Python Example'
26-
cd ./deploy/'Python Example'/assets
27-
rm -rf ./.git/
28-
rm .git
25+
rm -rf ./deploy/'Python Example'/assets/document-formats/.git
26+
rm -rf ./deploy/'Python Example'/assets/document-templates/.git
2927
- name: Upload Artifact
3028
uses: actions/upload-artifact@v3
3129
with:

‎.github/workflows/artifact-ruby.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ jobs:
1818
- name: Build Artifact
1919
run: |
2020
cd ${{ github.workspace }}
21-
cwd=$(pwd)
2221
git submodule update --init --recursive
2322
cd ./web/documentserver-example/ruby
2423
mkdir -p ./deploy/'Ruby Example'
2524
rsync -av --exclude='deploy' ./ ./deploy/'Ruby Example'
26-
cd ./deploy/'Ruby Example'/public/assets
27-
rm -rf ./.git/
28-
rm .git
25+
rm -rf ./deploy/'Ruby Example'/public/assets/document-formats/.git
26+
rm -rf ./deploy/'Ruby Example'/public/assets/document-templates/.git
2927
- name: Upload Artifact
3028
uses: actions/upload-artifact@v3
3129
with:

‎.github/workflows/artifact-spring.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ jobs:
2323
cd ./web/documentserver-example/java-spring
2424
mkdir -p ./deploy/'Java Spring Example'
2525
rsync -av --exclude='deploy' ./ ./deploy/'Java Spring Example'
26-
cd ./deploy/'Java Spring Example'/src/main/resources/assets
27-
rm -rf ./.git/
28-
rm .git
26+
rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-formats/.git
27+
rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-templates/.git
2928
- name: Upload Artifact
3029
uses: actions/upload-artifact@v3
3130
with:

‎.github/workflows/lint-php.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,5 @@ jobs:
2525
php-version: '8.2'
2626
tools: cs2pr, phpcs
2727

28-
- name: Run phpcs
29-
run: |
30-
phpcs --version
31-
phpcs -q --extensions=php,module,inc,install,test,profile,theme,info --ignore=node_modules,bower_components,vendor,css,js,lib --standard=./ruleset.xml ./
28+
- name: Lint
29+
run: phpcs src index.php

‎.github/workflows/lint-python.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
3333
- name: Lint Flake8
3434
run: |
35-
flake8 ./**/*.py --count --select=E9,F63,F7,F82 --show-source --statistics
36-
flake8 ./**/*.py --count --max-complexity=10 --max-line-length=79 --statistics
35+
flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
36+
flake8 --count --max-complexity=10 --max-line-length=79 --statistics
3737
3838
- name: Lint Pylint
3939
run: |
40-
pylint ./**/*.py
40+
find . -type f -name "*.py" | xargs pylint

‎.github/workflows/lint-ruby.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,22 @@ jobs:
1616
run:
1717
working-directory: ./web/documentserver-example/ruby
1818
steps:
19-
- name: Checkout Repository
20-
uses: actions/checkout@v3
21-
- uses: ruby/setup-ruby@v1
22-
with:
23-
ruby-version: '3.0'
24-
bundler-cache: true
25-
- name: Install dependencies
26-
run: |
27-
bundle install
28-
- name: Rubocop
29-
run: |
30-
gem install rubocop
31-
rubocop
19+
- name: Checkout Repository
20+
uses: actions/checkout@v3
21+
22+
- name: Setup Ruby
23+
uses: ruby/setup-ruby@v1
24+
with:
25+
ruby-version: '3.2.2'
26+
27+
- name: Update Submodules
28+
run: |
29+
git submodule update --init --recursive
30+
31+
- name: Install Dependencies
32+
run: |
33+
bundle update
34+
35+
- name: Rubocop
36+
run: |
37+
bundle exec rubocop

‎.github/workflows/release.yml

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
steps:
1414
- name: Checkout Repository
1515
uses: actions/checkout@v3
16-
- name: Install Zip
17-
run: sudo apt-get install zip
16+
- name: Clone Submodules
17+
run: |
18+
cd ${{ github.workspace }}
19+
git submodule update --init --recursive
1820
- name: Get Info
1921
run: |
2022
echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT
@@ -25,91 +27,66 @@ jobs:
2527
- name: Build Csharp MVC Artifact
2628
run: |
2729
cd ${{ github.workspace }}
28-
cwd=$(pwd)
29-
git submodule update --init --recursive
3030
cd ./web/documentserver-example/csharp-mvc
3131
mkdir -p ./'DotNet (Csharp MVC) Example'
3232
rsync -av --exclude='DotNet (Csharp MVC) Example' ./ ./'DotNet (Csharp MVC) Example'
3333
cd ./'DotNet (Csharp MVC) Example'/assets
34-
rm -rf ./.git/
35-
rm .git
34+
rm -rf .git
3635
- name: Build Csharp Artifact
3736
run: |
3837
cd ${{ github.workspace }}
39-
cwd=$(pwd)
40-
git submodule update --init --recursive
4138
cd ./web/documentserver-example/csharp
4239
mkdir -p ./'DotNet (Csharp) Example'
4340
rsync -av --exclude='DotNet (Csharp) Example' ./ ./'DotNet (Csharp) Example'
44-
cd ./'DotNet (Csharp) Example'/assets
45-
rm -rf ./.git/
46-
rm .git
41+
rm -rf ./'DotNet (Csharp) Example'/assets/.git
4742
- name: Build Java Artifact
4843
run: |
4944
cd ${{ github.workspace }}
50-
cwd=$(pwd)
51-
git submodule update --init --recursive
5245
cd ./web/documentserver-example/java
5346
mkdir -p ./'Java Example'
5447
rsync -av --exclude='Java Example' ./ ./'Java Example'
55-
cd ./'Java Example'/src/main/resources/assets
56-
rm -rf ./.git/
57-
rm .git
48+
rm -rf ./'Java Example'/src/main/resources/assets/document-formats/.git
49+
rm -rf ./'Java Example'/src/main/resources/assets/document-templates/.git
5850
- name: Build Nodejs Artifact
5951
run: |
6052
cd ${{ github.workspace }}
61-
cwd=$(pwd)
62-
git submodule update --init --recursive
6353
cd ./web/documentserver-example/nodejs
6454
mkdir -p ./'Node.js Example'
6555
rsync -av --exclude='Node.js Example' ./ ./'Node.js Example'
66-
cd ./'Node.js Example'/public/assets
67-
rm -rf ./.git/
68-
rm .git
56+
rm -rf ./'Node.js Example'/public/assets/document-formats/.git
57+
rm -rf ./'Node.js Example'/public/assets/document-templates/.git
6958
- name: Build PHP Artifact
7059
run: |
7160
cd ${{ github.workspace }}
72-
cwd=$(pwd)
73-
git submodule update --init --recursive
7461
cd ./web/documentserver-example/php
7562
mkdir -p ./'PHP Example'
7663
rsync -av --exclude='PHP Example' ./ ./'PHP Example'
77-
cd ./'PHP Example'/assets
78-
rm -rf ./.git/
79-
rm .git
64+
rm -rf ./'PHP Example'/assets/document-formats/.git
65+
rm -rf ./'PHP Example'/assets/document-templates/.git
8066
- name: Build Python Artifact
8167
run: |
8268
cd ${{ github.workspace }}
83-
cwd=$(pwd)
84-
git submodule update --init --recursive
8569
cd ./web/documentserver-example/python
8670
mkdir -p ./'Python Example'
8771
rsync -av --exclude='Python Example' ./ ./'Python Example'
88-
cd ./'Python Example'/assets
89-
rm -rf ./.git/
90-
rm .git
72+
rm -rf ./'Python Example'/assets/document-formats/.git
73+
rm -rf ./'Python Example'/assets/document-templates/.git
9174
- name: Build Ruby Artifact
9275
run: |
9376
cd ${{ github.workspace }}
94-
cwd=$(pwd)
95-
git submodule update --init --recursive
9677
cd ./web/documentserver-example/ruby
9778
mkdir -p ./'Ruby Example'
9879
rsync -av --exclude='Ruby Example' ./ ./'Ruby Example'
99-
cd ./'Ruby Example'/public/assets
100-
rm -rf ./.git/
101-
rm .git
80+
rm -rf ./'Ruby Example'/public/assets/document-formats/.git
81+
rm -rf ./'Ruby Example'/public/assets/document-templates/.git
10282
- name: Build Spring Artifact
10383
run: |
10484
cd ${{ github.workspace }}
105-
cwd=$(pwd)
106-
git submodule update --init --recursive
10785
cd ./web/documentserver-example/java-spring
10886
mkdir -p ./'Java Spring Example'
10987
rsync -av --exclude='Java Spring Example' ./ ./'Java Spring Example'
110-
cd ./'Java Spring Example'/src/main/resources/assets
111-
rm -rf ./.git/
112-
rm .git
88+
rm -rf ./'Java Spring Example'/src/main/resources/assets/document-formats/.git
89+
rm -rf ./'Java Spring Example'/src/main/resources/assets/document-templates/.git
11390
- name: Pack Artifacts
11491
run: |
11592
cd ${{ github.workspace }}/web/documentserver-example/csharp-mvc

‎.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,3 @@
2222
/web/documentserver-example/csharp/packages
2323
/web/documentserver-example/csharp-mvc/packages
2424
/web/documentserver-example/java-spring/documents/
25-
/web/documentserver-example/ruby/.bundle
26-
/web/documentserver-example/ruby/db/*.sqlite3
27-
/web/documentserver-example/ruby/db/*.sqlite3-journal
28-
/web/documentserver-example/ruby/log/*
29-
/web/documentserver-example/ruby/tmp

‎.gitmodules

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,48 @@
1-
[submodule "web/documentserver-example/nodejs/public/assets"]
2-
path = web/documentserver-example/nodejs/public/assets
1+
[submodule "web/documentserver-example/csharp-mvc/assets"]
2+
path = web/documentserver-example/csharp-mvc/assets
33
url = https://github.com/ONLYOFFICE/document-templates
44
branch = main/en
5-
[submodule "web/documentserver-example/java/src/main/resources/assets"]
6-
path = web/documentserver-example/java/src/main/resources/assets
5+
[submodule "web/documentserver-example/csharp/assets"]
6+
path = web/documentserver-example/csharp/assets
77
url = https://github.com/ONLYOFFICE/document-templates
88
branch = main/en
9-
[submodule "web/documentserver-example/php/assets"]
10-
path = web/documentserver-example/php/assets
9+
[submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
10+
path = web/documentserver-example/nodejs/public/assets/document-templates
1111
url = https://github.com/ONLYOFFICE/document-templates
1212
branch = main/en
13-
[submodule "web/documentserver-example/python/assets"]
14-
path = web/documentserver-example/python/assets
13+
[submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
14+
path = web/documentserver-example/nodejs/public/assets/document-formats
15+
url = https://github.com/ONLYOFFICE/document-formats
16+
branch = master
17+
[submodule "web/documentserver-example/php/assets/document-templates"]
18+
path = web/documentserver-example/php/assets/document-templates
1519
url = https://github.com/ONLYOFFICE/document-templates
1620
branch = main/en
17-
[submodule "web/documentserver-example/csharp-mvc/assets"]
18-
path = web/documentserver-example/csharp-mvc/assets
21+
[submodule "web/documentserver-example/php/assets/document-formats"]
22+
path = web/documentserver-example/php/assets/document-formats
23+
url = https://github.com/ONLYOFFICE/document-formats
24+
branch = master
25+
[submodule "web/documentserver-example/python/assets/document-templates"]
26+
path = web/documentserver-example/python/assets/document-templates
1927
url = https://github.com/ONLYOFFICE/document-templates
2028
branch = main/en
21-
[submodule "web/documentserver-example/csharp/assets"]
22-
path = web/documentserver-example/csharp/assets
29+
[submodule "web/documentserver-example/java/src/main/resources/assets/document-templates"]
30+
path = web/documentserver-example/java/src/main/resources/assets/document-templates
2331
url = https://github.com/ONLYOFFICE/document-templates
2432
branch = main/en
25-
[submodule "web/documentserver-example/ruby/public/assets"]
26-
path = web/documentserver-example/ruby/public/assets
33+
[submodule "web/documentserver-example/ruby/assets/document-templates"]
34+
path = web/documentserver-example/ruby/assets/document-templates
2735
url = https://github.com/ONLYOFFICE/document-templates
2836
branch = main/en
29-
[submodule "web/documentserver-example/java-spring/src/main/resources/assets"]
30-
path = web/documentserver-example/java-spring/src/main/resources/assets
37+
[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-templates"]
38+
path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates
3139
url = https://github.com/ONLYOFFICE/document-templates
3240
branch = main/en
41+
[submodule "web/documentserver-example/python/assets/document-formats"]
42+
path = web/documentserver-example/python/assets/document-formats
43+
url = https://github.com/ONLYOFFICE/document-formats
44+
branch = master
45+
[submodule "web/documentserver-example/ruby/assets/document-formats"]
46+
path = web/documentserver-example/ruby/assets/document-formats
47+
url = https://github.com/ONLYOFFICE/document-formats
48+
branch = master

0 commit comments

Comments
 (0)