Merge pull request #103 from ONLYOFFICE/develop

Release/4.3.0

.gitmodules

@@ -1,4 +1,8 @@
-[submodule "src/main/resources/app_data"]
-	path = src/main/resources/app_data
+[submodule "src/main/resources/app_data/document-templates"]
+	path = src/main/resources/app_data/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/new
+[submodule "src/main/resources/app_data/document-formats"]
+	path = src/main/resources/app_data/document-formats
+	url = https://github.com/ONLYOFFICE/document-formats
+	branch = master

3rd-Party.license

@@ -1,29 +1,13 @@
 Confluence ONLYOFFICE integration app uses code from the following 3rd party projects:
 
 
-atlassian-plugins-osgi-testrunner - Atlassian Plugins TestRunner (https://maven.atlassian.com/public/licenses/license.txt)
-License:              The 3-Clause BSD License
-License File:         atlassian-plugins-osgi-testrunner.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
 
-atlassian-spring-scanner-annotation - Atlassian Spring Scanner Annotations (https://www.apache.org/licenses/LICENSE-2.0)
-License:              Apache 2.0
-License File:         atlassian-spring-scanner-annotation.license
-
-commons-collections - Types that extend and augment the Java Collections Framework. (https://www.apache.org/licenses/LICENSE-2.0)
-License:              Apache 2.0
-License File:         commons-collections.license
-
-commons-httpclient  - The HttpClient component supports the client-side of RFC 1945 (HTTP/1.0) and RFC 2616 (HTTP/1.1) , several related specifications (RFC 2109 (Cookies) , RFC 2617 (HTTP Authentication) , etc.), and provides a framework by which new request types (methods) or HTTP extensions can be created easily. (https://www.apache.org/licenses/LICENSE-2.0)
-License:              Apache 2.0
-License File:         commons-httpclient.license
-
-javax.inject        - The javax.inject API (https://www.apache.org/licenses/LICENSE-2.0)
-License:              Apache 2.0
-License File:         javax.inject.license
-
-javax.enterprise.cdi-api - Contexts and Dependency Injection for Java (https://github.com/eclipse-ee4j/cdi/blob/master/LICENSE.txt)
-License:              Apache 2.0
-License File          javax.enterprise.cdi-api.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.16/LICENSE)
+License:              Apache License 2.0
+License File:         com.fasterxml.jackson.core.jackson-databind.license
 
 javax.servlet-api   - Java Servlet API (https://opensource.org/licenses/CDDL-1.0 https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 License:              CDDL, GPL 2.0
@@ -32,7 +16,3 @@ License File:         javax.servlet-api.license
 JSON                - JSON is a light-weight, language independent, data interchange format. See http://www.JSON.org/ The files in this package implement JSON encoders/decoders in Java. It also includes the capability to convert between JSON and XML, HTTP headers, Cookies, and CDL. This is a reference implementation. (http://json.org/license.html)
 License:              JSON
 License File:         JSON.license
-
-SAL API             - A plugin that provides API for Shared Application Access Layer (https://opensource.org/licenses/BSD-3-Clause)
-License:              The 3-Clause BSD License
-License File:         SAL API.license

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 4.3.0
+## Added
+- compatible with Confluence 8.4.0
+- extended list of supported formats
+- document server v6.4 and earlier is no longer supported
+- macros for view documents
+- improvement of jwt signature
+- download as
+- Paste Special to add a link between files
+
 ## 4.2.0
 ## Changed
 - compatible with Confluence 8.1.1

README.md

@@ -12,8 +12,32 @@ The app allows to:
 
 Supported formats:
 
-* For viewing and editing: DOCX, XLSX, PPTX, DOCXF, OFORM.
-* For conversion to Office Open XML: ODT, DOC, ODP, PPT, ODS, XLS. 
+**For viewing:**
+* **WORD:** DJVU, DOC, DOCM, DOCX, DOCXF, DOT, DOTM, DOTX, EPUB, FB2, FODT, HTM, HTML, MHT, ODT, OFORM, OTT, OXPS, PDF, RTF, TXT, XML, XPS
+* **CELL:** CSV, FODS, ODS, OTS, XLS, XLSM, XLSX, XLT, XLTM, XLTX
+* **SLIDE:** FODP, ODP, OTP, POT, POTM, POTX, PPS, PPSM, PPSX, PPT, PPTM, PPTX
+
+**For editing:**
+
+* **WORD:** DOCM, DOCX, DOCXF, DOTM, DOTX, HTM, XML
+* **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:** OFORM
+
+**For converting to Office Open XML formats:**
+
+* **WORD:** DOC, DOCM, DOCXF, DOT, DOTM, DOTX, EPUB, FB2, FODT, HTM, HTML, MHT, ODT, OTT, OXPS, PDF, RTF, XML, XPS
+* **CELL:** FODS, ODS, OTS, XLS, XLSM, XLT, XLTM, XLTX
+* **SLIDE:** FODP, ODP, OTP, POT, POTM, POTX, PPS, PPSM, PPSX, PPT, PPTM
 
 ## Installing ONLYOFFICE Docs
 

licenses/3rd-Party.license

@@ -1,29 +1,13 @@
 Confluence ONLYOFFICE integration app uses code from the following 3rd party projects:
 
 
-atlassian-plugins-osgi-testrunner - Atlassian Plugins TestRunner (https://maven.atlassian.com/public/licenses/license.txt)
-License:              The 3-Clause BSD License
-License File:         atlassian-plugins-osgi-testrunner.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
 
-atlassian-spring-scanner-annotation - Atlassian Spring Scanner Annotations (https://www.apache.org/licenses/LICENSE-2.0)
-License:              Apache 2.0
-License File:         atlassian-spring-scanner-annotation.license
-
-commons-collections - Types that extend and augment the Java Collections Framework. (https://www.apache.org/licenses/LICENSE-2.0)
-License:              Apache 2.0
-License File:         commons-collections.license
-
-commons-httpclient  - The HttpClient component supports the client-side of RFC 1945 (HTTP/1.0) and RFC 2616 (HTTP/1.1) , several related specifications (RFC 2109 (Cookies) , RFC 2617 (HTTP Authentication) , etc.), and provides a framework by which new request types (methods) or HTTP extensions can be created easily. (https://www.apache.org/licenses/LICENSE-2.0)
-License:              Apache 2.0
-License File:         commons-httpclient.license
-
-javax.inject        - The javax.inject API (https://www.apache.org/licenses/LICENSE-2.0)
-License:              Apache 2.0
-License File:         javax.inject.license
-
-javax.enterprise.cdi-api - Contexts and Dependency Injection for Java (https://github.com/eclipse-ee4j/cdi/blob/master/LICENSE.txt)
-License:              Apache 2.0
-License File          javax.enterprise.cdi-api.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.16/LICENSE)
+License:              Apache License 2.0
+License File:         com.fasterxml.jackson.core.jackson-databind.license
 
 javax.servlet-api   - Java Servlet API (https://opensource.org/licenses/CDDL-1.0 https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 License:              CDDL, GPL 2.0
@@ -32,7 +16,3 @@ License File:         javax.servlet-api.license
 JSON                - JSON is a light-weight, language independent, data interchange format. See http://www.JSON.org/ The files in this package implement JSON encoders/decoders in Java. It also includes the capability to convert between JSON and XML, HTTP headers, Cookies, and CDL. This is a reference implementation. (http://json.org/license.html)
 License:              JSON
 License File:         JSON.license
-
-SAL API             - A plugin that provides API for Shared Application Access Layer (https://opensource.org/licenses/BSD-3-Clause)
-License:              The 3-Clause BSD License
-License File:         SAL API.license

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.