Merge pull request #209 from ONLYOFFICE/develop

Release/7.0.0
ONLYOFFICE · Apr 24, 2024 · 3c0c736 · 3c0c736
2 parents 7111204 + 87c803a
commit 3c0c736
Show file tree

Hide file tree

Showing 116 changed files with 3,421 additions and 2,387 deletions.
diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml
@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get Info 
         run: |
           echo "artifact=$(awk '/<artifactId>/,/<\/artifactId>/' pom.xml | head -n 1 | sed 's/^[[:space:]]*//g' | sed -n 's:.*<artifactId>\(.*\)</artifactId>.*:\1:p')" >> $GITHUB_OUTPUT
         id: info
-      - name: Install Java 11
-        uses: actions/setup-java@v3
+      - name: Install Java 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}
@@ -30,12 +30,12 @@ jobs:
           mv ./repo/target/${{ steps.info.outputs.artifact }}-repo.amp $cwd
           mv ./share/target/${{ steps.info.outputs.artifact }}-share.amp $cwd
       - name: Upload Repo Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.info.outputs.artifact }}-repo
           path: ${{ steps.info.outputs.artifact }}-repo.amp
       - name: Upload Share Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.info.outputs.artifact }}-share
           path: ${{ steps.info.outputs.artifact }}-share.amp
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,17 +9,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get Info 
         run: | 
           echo "version=$(awk '/<version>/,/<\/version>/' pom.xml | head -n 1 | sed 's/^[[:space:]]*//g' | sed -n 's:.*<version>\(.*\)</version>.*:\1:p')" >> $GITHUB_OUTPUT
           echo "artifact=$(awk '/<artifactId>/,/<\/artifactId>/' pom.xml | head -n 1 | sed 's/^[[:space:]]*//g' | sed -n 's:.*<artifactId>\(.*\)</artifactId>.*:\1:p')" >> $GITHUB_OUTPUT
         id: info
-      - name: Install Java 11
-        uses: actions/setup-java@v3
+      - name: Install Java 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Build Artifact
         run: |
           cd ${{ github.workspace }}

diff --git a/.gitmodules b/.gitmodules
diff --git a/3rd-Party.license b/3rd-Party.license
@@ -1,25 +1,33 @@
 ONLYOFFICE Alfresco module package uses code from the following 3rd party projects.
 
-alfresco-community-repo    - This project contains the bulk of the Alfresco Content Services Repository code. (https://github.com/Alfresco/alfresco-community-repo/blob/master/LICENSE.txt)
-License:                     LGPL v3.0
-License File                 alfresco-community-repo.license
+org.alfresco.acs-community-packaging                           - Alfresco Content Services Community Packaging. (https://github.com/Alfresco/acs-community-packaging/blob/master/LICENSE)
+License:                                                         Apache License 2.0
+License File                                                     org.alfresco.acs-community-packaging.license
 
-alfresco-sdk               - The Alfresco SDK is used by developers to build extensions for the Alfresco Digital Business Platform. (https://github.com/Alfresco/alfresco-sdk/blob/master/LICENSE)
-License:                     Apache
-License File                 alfresco-sdk.license
+org.alfresco.alfresco-remote-api                               - Alfresco Remote API. (https://github.com/Alfresco/alfresco-remote-api/blob/master/LICENSE)
+License:                                                         LGPL-3.0 license
+License File                                                     org.alfresco.alfresco-remote-api.license
 
-alfresco-share             - Share is an option for the front end of the Alfresco Content Service offering. (https://github.com/Alfresco/share/blob/master/LICENSE)
-License:                     LGPL v3.0
-License File                 alfresco-share.license
+org.alfresco.share                                             - Share is an option for the front end of the Alfresco Content Service offering. (https://github.com/Alfresco/share/blob/master/LICENSE)
+License:                                                         LGPL-3.0 license
+License File                                                     org.alfresco.share.license
 
-alfresco-solr              - Solr is the popular, blazing fast open source enterprise search platform from the Apache Lucene project. (https://github.com/Alfresco/lucene-solr/blob/master/solr/LICENSE.txt)
-License:                     Apache
-License File                 alfresco-solr.license
+org.alfresco.alfresco-web-framework-commons                    - Alfresco Web Framework common libraries. (https://github.com/Alfresco/alfresco-community-share/blob/master/LICENSE)
+License:                                                         LGPL-3.0 license
+License File                                                     org.alfresco.alfresco-web-framework-commons.license
 
-alfresco-surf              - Surf is a user interface development framework that is used for implementing Share Web Scripts, pages and Dashlets. (https://github.com/Alfresco/surf/blob/develop/LICENSE.md)
-License:                     LGPL v3.0
-License File                 alfresco-surf.license
+com.auth0.java-jwt                                             - Java implementation of JSON Web Token (JWT). (https://github.com/auth0/java-jwt/blob/master/LICENSE)
+License:                                                         MIT license
+License File                                                     com.auth0.java-jwt.license
 
-alfresco-surf-webscripts   - Surf Web Scripts are basically Rest-based APIs that are used when implementing pages and Dashlets for the Alfresco Share web application. (https://github.com/Alfresco/surf-webscripts/blob/master/LICENSE)
-License:                     Apache
-License File                 alfresco-surf-webscripts.license
+com.fasterxml.jackson.core.jackson-databind                    - General data-binding functionality for Jackson: works on core streaming API. (https://github.com/FasterXML/jackson-databind/blob/2.18/LICENSE)
+License:                                                         Apache License 2.0
+License File                                                     com.fasterxml.jackson.core.jackson-databind.license
+
+com.fasterxml.jackson.dataformat.jackson-dataformat-properties - Support for reading and writing content of "Java Properties" style configuration files as if there was implied nesting structure (by default using dots as separators). (https://github.com/FasterXML/jackson-dataformats-text/blob/2.18/LICENSE)
+License:                                                         Apache License 2.0
+License File                                                     com.fasterxml.jackson.dataformat.jackson-dataformat-properties.license
+
+javax.servlet.javax.servlet-api                                - Java Servlet is the foundation web specification in the Java Enterprise Platform. Developers can build web applications using the Servlet API to interact with the request/response workflow. (https://oss.oracle.com/licenses/CDDL+GPL-1.1)
+License:                                                         CDDL + GPLv2 with classpath exception
+License File                                                     javax.servlet.javax.servlet-api.license
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Change Log
 
+## 7.0.0
+## Added
+- core of the plugin has been moved to com.onlyoffice.docs-integration-sdk (https://github.com/ONLYOFFICE/docs-integration-sdk-java)
+- document server v6.4 and earlier is no longer supported
+- setting authorization header on settings page
+- setting the version after closing the document
+- docs cloud banner on settings page
+- filling pdf
+- wait dialog for convert action
+- comment "ONLYOFFICE (forcesave)" for forcesave versions
+
+## Changed
+- Alfresco v7.0.* and earlier is no longer supported
+- default conversion format (from docxf to pdf instead oform)
+- remove filling for oform
+- forcesave versions don't show in editor history
+
 ## 6.1.0
 ## Added
 - manage permissions from editor

diff --git a/README.md b/README.md
@@ -8,13 +8,34 @@ This plugin enables users to edit office documents from Alfresco Share using ONL
 * Share documents with other users.
 * Co-edit documents in real-time: use two co-editing modes (Fast and Strict), Track Changes, comments, and built-in chat.
 
-Supported formats:
+## Supported formats
 
-* For editing: DOCX, XLSX, PPTX, DOCXF, OFORM.
-* For editing via conversion to OOXML: CSV, ODP, ODS, ODT, RTF, TXT.
-* For viewing: DJVU, DOC, DOCM, DOCX, DOCXF, OFORM, DOT, DOTM, DOTX, EPUB, FB2, FODT, HTML, MHT, ODT, OTT, PDF, RTF, TXT, XPS, OXPS, XML, CSV, FODS, ODS, OTS, XLS, XLSM, XLSX, XLT, XLTM, XLTX, FODP, ODP, OTP, POT, POTM, POTX, PPS, PPSM, PPSX, PPT, PPTM, PPTX.
-* For converting (download as): DOC, DOCM, DOCX, DOCXF, OFORM, DOT, DOTM, DOTX, EPUB, FB2, FODT, HTML, MHT, ODT, OTT, RTF, XPS, OXPS, XML, FODS, ODS, OTS, XLS, XLSM, XLSX, XLT, XLTM, XLTX, FODP, ODP, OTP, POT, POTM, POTX, PPS, PPSM, PPSX, PPT, PPTM, PPTX
-* For converting to Office Open XML: DOC, DOCM, DOCXF, DOT, DOTM, DOTX, EPUB, FB2, FODT, HTML, MHT, ODT, OTT, RTF, XML, FODS, ODS, OTS, XLS, XLSM, XLT, XLTM, XLTX, FODP, ODP, OTP, POT, POTM, POTX, PPS, PPSM, PPSX, PPT, PPTM.
+**For viewing:**
+* **WORD**: DJVU, DOC, DOCM, DOCX, DOCXF, DOT, DOTM, DOTX, EPUB, FB2, FODT, HTM, HTML, MHT, MHTML, ODT, OFORM, OTT, OXPS, PDF, RTF, STW, SXW, TXT, WPS, WPT, XML, XPS
+* **CELL**: CSV, ET, ETT, FODS, ODS, OTS, SXC, XLS, XLSB, XLSM, XLSX, XLT, XLTM, XLTX
+* **SLIDE**: DPS, DPT, FODP, ODP, OTP, POT, POTM, POTX, PPS, PPSM, PPSX, PPT, PPTM, PPTX, SXI
+
+**For editing:**
+
+* **WORD**: DOCM, DOCX, DOCXF, DOTM, DOTX
+* **CELL**: XLSM, XLSX, XLTM, XLTX
+* **SLIDE**: POTM, POTX, PPSM, PPSX, PPTM, PPTX
+
+**For editing with possible loss of information:**
+
+* **WORD**: EPUB, FB2, HTML, ODT, OTT, RTF, TXT
+* **CELL**: CSV, ODS, OTS
+* **SLIDE**: ODP, OTP
+
+**For filling:**
+
+* **WORD**: PDF
+
+**For converting to Office Open XML formats:**
+
+* **WORD:** DOC, DOCM, DOCXF, DOT, DOTM, DOTX, EPUB, FB2, FODT, HTM, HTML, MHT, MHTML, ODT, OTT, OXPS, PDF, RTF, STW, SXW, WPS, WPT, XML, XPS
+* **CELL:** ET, ETT, FODS, ODS, OTS, SXC, XLS, XLSB, XLSM, XLT, XLTM, XLTX
+* **SLIDE:** DPS, DPT, FODP, ODP, OTP, POT, POTM, POTX, PPS, PPSM, PPSX, PPT, PPTM, SXI
 
 To convert a specific file, select `Convert using ONLYOFFICE` action. Resulting file will be placed in the same folder. You can also configure rules for a folder, that will automatically convert files on upload or on change. Details [here](https://docs.alfresco.com/5.1/tasks/library-folder-rules-define-create.html).
 
@@ -83,7 +104,7 @@ Module configuration can be found inside `Alfresco Administration Console` or by
 > You can also add `onlyoffice.url` in `alfresco-global.properties`. Configuration made via settings page will override `alfresco-global.properties`.
 
 Starting from version 7.2, JWT is enabled by default and the secret key is generated automatically to restrict the access to ONLYOFFICE Docs and for security reasons and data integrity. 
-Specify your own **Secret key** on the Alfresco configuration page or by adding *onlyoffice.jwtsecret* to `alfresco-global.properties`. In the ONLYOFFICE Docs [config file](https://api.onlyoffice.com/editors/signature/), specify the same secret key and enable the validation.
+Specify your own **Secret key** on the Alfresco configuration page or by adding *onlyoffice.security.key* to `alfresco-global.properties`. In the ONLYOFFICE Docs [config file](https://api.onlyoffice.com/editors/signature/), specify the same secret key and enable the validation.
 
 ## Compiling ONLYOFFICE Alfresco module package
 
@@ -207,12 +228,18 @@ The table below will help you make the right choice.
 | Font and paragraph formatting   | + | + |
 | Object insertion                | + | + |
 | Transitions                     | + | + |
+| Animations                      | + | + |
 | Presenter mode                  | + | + |
 | Notes                           | + | + |
 | **Form creator features** | **Community Edition** | **Enterprise Edition** |
 | Adding form fields	          | + | + |
 | Form preview                    | + | + |
 | Saving as PDF	                  | + | + |
+| **Working with PDF**      | **Community Edition** | **Enterprise Edition** |
+| Text annotations (highlight, underline, cross out) | + | + |
+| Comments                        | + | + |
+| Freehand drawings               | + | + |
+| Form filling                    | + | + |
 | | [Get it now](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubAlfresco#docs-community)  | [Start Free Trial](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubAlfresco#docs-enterprise) |
 
 \* If supported by DMS.
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/licenses/3rd-Party.license b/licenses/3rd-Party.license
@@ -1,25 +1,33 @@
 ONLYOFFICE Alfresco module package uses code from the following 3rd party projects.
 
-alfresco-community-repo    - This project contains the bulk of the Alfresco Content Services Repository code. (https://github.com/Alfresco/alfresco-community-repo/blob/master/LICENSE.txt)
-License:                     LGPL v3.0
-License File                 alfresco-community-repo.license
+org.alfresco.acs-community-packaging                           - Alfresco Content Services Community Packaging. (https://github.com/Alfresco/acs-community-packaging/blob/master/LICENSE)
+License:                                                         Apache License 2.0
+License File                                                     org.alfresco.acs-community-packaging.license
 
-alfresco-sdk               - The Alfresco SDK is used by developers to build extensions for the Alfresco Digital Business Platform. (https://github.com/Alfresco/alfresco-sdk/blob/master/LICENSE)
-License:                     Apache
-License File                 alfresco-sdk.license
+org.alfresco.alfresco-remote-api                               - Alfresco Remote API. (https://github.com/Alfresco/alfresco-remote-api/blob/master/LICENSE)
+License:                                                         LGPL-3.0 license
+License File                                                     org.alfresco.alfresco-remote-api.license
 
-alfresco-share             - Share is an option for the front end of the Alfresco Content Service offering. (https://github.com/Alfresco/share/blob/master/LICENSE)
-License:                     LGPL v3.0
-License File                 alfresco-share.license
+org.alfresco.share                                             - Share is an option for the front end of the Alfresco Content Service offering. (https://github.com/Alfresco/share/blob/master/LICENSE)
+License:                                                         LGPL-3.0 license
+License File                                                     org.alfresco.share.license
 
-alfresco-solr              - Solr is the popular, blazing fast open source enterprise search platform from the Apache Lucene project. (https://github.com/Alfresco/lucene-solr/blob/master/solr/LICENSE.txt)
-License:                     Apache
-License File                 alfresco-solr.license
+org.alfresco.alfresco-web-framework-commons                    - Alfresco Web Framework common libraries. (https://github.com/Alfresco/alfresco-community-share/blob/master/LICENSE)
+License:                                                         LGPL-3.0 license
+License File                                                     org.alfresco.alfresco-web-framework-commons.license
 
-alfresco-surf              - Surf is a user interface development framework that is used for implementing Share Web Scripts, pages and Dashlets. (https://github.com/Alfresco/surf/blob/develop/LICENSE.md)
-License:                     LGPL v3.0
-License File                 alfresco-surf.license
+com.auth0.java-jwt                                             - Java implementation of JSON Web Token (JWT). (https://github.com/auth0/java-jwt/blob/master/LICENSE)
+License:                                                         MIT license
+License File                                                     com.auth0.java-jwt.license
 
-alfresco-surf-webscripts   - Surf Web Scripts are basically Rest-based APIs that are used when implementing pages and Dashlets for the Alfresco Share web application. (https://github.com/Alfresco/surf-webscripts/blob/master/LICENSE)
-License:                     Apache
-License File                 alfresco-surf-webscripts.license
+com.fasterxml.jackson.core.jackson-databind                    - General data-binding functionality for Jackson: works on core streaming API. (https://github.com/FasterXML/jackson-databind/blob/2.18/LICENSE)
+License:                                                         Apache License 2.0
+License File                                                     com.fasterxml.jackson.core.jackson-databind.license
+
+com.fasterxml.jackson.dataformat.jackson-dataformat-properties - Support for reading and writing content of "Java Properties" style configuration files as if there was implied nesting structure (by default using dots as separators). (https://github.com/FasterXML/jackson-dataformats-text/blob/2.18/LICENSE)
+License:                                                         Apache License 2.0
+License File                                                     com.fasterxml.jackson.dataformat.jackson-dataformat-properties.license
+
+javax.servlet.javax.servlet-api                                - Java Servlet is the foundation web specification in the Java Enterprise Platform. Developers can build web applications using the Servlet API to interact with the request/response workflow. (https://oss.oracle.com/licenses/CDDL+GPL-1.1)
+License:                                                         CDDL + GPLv2 with classpath exception
+License File                                                     javax.servlet.javax.servlet-api.license
diff --git a/licenses/com.auth0.java-jwt.license b/licenses/com.auth0.java-jwt.license
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Auth0, Inc. <support@auth0.com> (http://auth0.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/licenses/alfresco-surf-webscripts.license → ...xml.jackson.core.jackson-databind.license b/licenses/alfresco-surf-webscripts.license → ...xml.jackson.core.jackson-databind.license
@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -198,4 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.