Merge pull request #549 from ONLYOFFICE/release/1.8.0

Release/1.8.0
ONLYOFFICE · Mar 15, 2024 · 333981c · 333981c
2 parents 2459863 + 65ff78f
commit 333981c
Show file tree

Hide file tree

Showing 439 changed files with 6,339 additions and 3,432 deletions.
diff --git a/.github/workflows/artifact-csharp-mvc.yml b/.github/workflows/artifact-csharp-mvc.yml
@@ -3,10 +3,10 @@ name: Artifact Csharp MVC
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/csharp-mvc/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/csharp-mvc/**']
 
 jobs:

diff --git a/.github/workflows/artifact-csharp.yml b/.github/workflows/artifact-csharp.yml
@@ -3,10 +3,10 @@ name: Artifact Csharp
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/csharp/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master]
     paths: ['web/documentserver-example/csharp/**']
 
 jobs:

diff --git a/.github/workflows/artifact-java.yml b/.github/workflows/artifact-java.yml
@@ -3,10 +3,10 @@ name: Artifact Java
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/java/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/java/**']
 
 jobs:

diff --git a/.github/workflows/artifact-node.yml b/.github/workflows/artifact-node.yml
@@ -3,10 +3,10 @@ name: Artifact Nodejs
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/nodejs/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/nodejs/**']
 
 jobs:

diff --git a/.github/workflows/artifact-php.yml b/.github/workflows/artifact-php.yml
@@ -3,10 +3,10 @@ name: Artifact PHP
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/php/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/php/**']
 
 jobs:

diff --git a/.github/workflows/artifact-python.yml b/.github/workflows/artifact-python.yml
@@ -3,10 +3,10 @@ name: Artifact Python
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/python/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/python/**']
 
 jobs:

diff --git a/.github/workflows/artifact-ruby.yml b/.github/workflows/artifact-ruby.yml
@@ -3,10 +3,10 @@ name: Artifact Ruby
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/ruby/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/ruby/**']
 
 jobs:

diff --git a/.github/workflows/artifact-spring.yml b/.github/workflows/artifact-spring.yml
@@ -3,10 +3,10 @@ name: Artifact Java Spring
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/java-spring/**']
   pull_request:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/java-spring/**']
 
 jobs:

diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml
@@ -21,20 +21,17 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10' 
+          python-version: '3.11' 
 
       - name: Install Dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install flake8
-          pip install pylint
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          make dev
 
       - name: Lint Flake8
         run: |
-          flake8 --count --select=E9,F63,F7,F82 --show-source --statistics
-          flake8 --count --max-complexity=10 --max-line-length=79 --statistics
-          
-      - name: Lint Pylint
-        run: |
-          find . -type f -name "*.py" | xargs pylint 
+          make lint
+
+      # TODO: Configure mypy
+      # - name: Types mypy
+      #   run: |
+      #     make types
diff --git a/.gitmodules b/.gitmodules
@@ -1,19 +1,18 @@
-[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/csharp/assets"]
-	path = web/documentserver-example/csharp/assets
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
 [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/nodejs/public/assets/document-formats"]
 	path = web/documentserver-example/nodejs/public/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
+	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
+	branch = main/en
+[submodule "web/documentserver-example/csharp-mvc/assets/document-formats"]
+	path = web/documentserver-example/csharp-mvc/assets/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats
 [submodule "web/documentserver-example/php/assets/document-templates"]
 	path = web/documentserver-example/php/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
@@ -46,3 +45,18 @@
 	path = web/documentserver-example/ruby/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
 	branch = master
+[submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"]
+	path = web/documentserver-example/java/src/main/resources/assets/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats
+	branch = master
+[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-formats"]
+	path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats
+	branch = master
+[submodule "web/documentserver-example/csharp/assets/document-templates"]
+	path = web/documentserver-example/csharp/assets/document-templates
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
+[submodule "web/documentserver-example/csharp/assets/document-formats"]
+	path = web/documentserver-example/csharp/assets/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats
diff --git a/3rd-Party.license b/3rd-Party.license
@@ -113,6 +113,10 @@ Prime JWT     - is intended to be fast and easy to use. Prime JWT has a single e
 License:        Apache 2.0
 License File:   prime-jwt.license
 
+Project Lombok - Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more! (https://projectlombok.org/LICENSE)
+License:        MIT
+License File:   lombok.license
+
 
 web/documentserver-example/java-spring
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Change Log
 
+## 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
+- getting history via api
+- using a repo with a list of formats
+- convert after uploading only tagged formats
+- link in referenceData
+- setUsers for region protection
+- onRequestOpen method
+- user avatar
+- trimming long name of uploading file
+- onRequestSelectDocument method
+- onRequestSelectSpreadsheet method
+- key in referenceData
+- restore from history
+
 ## 1.7.0
 - nodejs: onRequestSelectDocument method
 - nodejs: onRequestSelectSpreadsheet method

diff --git a/Readme.md b/Readme.md
@@ -11,8 +11,10 @@ You should change `http://documentserver` to your server address in these files:
 * [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
 * [.Net (C#)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp) - `web/documentserver-example/csharp/settings.config`
 * [Java](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java) - `web/documentserver-example/java/src/main/resources/settings.properties`
+* [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties`
 * [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json`
-* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.php`
+* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.json`
+* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/config.py`
 * [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/config/application.rb`
 
 More information on how to use these examples can be found here: [http://api.onlyoffice.com/editors/demopreview](http://api.onlyoffice.com/editors/demopreview "http://api.onlyoffice.com/editors/demopreview")

diff --git a/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs b/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs b/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs b/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs b/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web/documentserver-example/csharp-mvc/Content/editor.css b/web/documentserver-example/csharp-mvc/Content/editor.css
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_docx.svg b/web/documentserver-example/csharp-mvc/Content/images/file_docx.svg
diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg b/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg
diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_pptx.svg b/web/documentserver-example/csharp-mvc/Content/images/file_pptx.svg
diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_upload.svg b/web/documentserver-example/csharp-mvc/Content/images/file_upload.svg
diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_xlsx.svg b/web/documentserver-example/csharp-mvc/Content/images/file_xlsx.svg
diff --git a/web/documentserver-example/csharp-mvc/Content/images/uid-1.png b/web/documentserver-example/csharp-mvc/Content/images/uid-1.png
diff --git a/web/documentserver-example/csharp-mvc/Content/images/uid-2.png b/web/documentserver-example/csharp-mvc/Content/images/uid-2.png
diff --git a/web/documentserver-example/csharp-mvc/Content/media.css b/web/documentserver-example/csharp-mvc/Content/media.css
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web/documentserver-example/csharp-mvc/Content/stylesheet.css b/web/documentserver-example/csharp-mvc/Content/stylesheet.css
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web/documentserver-example/csharp-mvc/Global.asax.cs b/web/documentserver-example/csharp-mvc/Global.asax.cs
@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.