From b567e67bf573ae11c56bccd93bf6e8f0d6234996 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 13 Aug 2021 13:45:24 +0200
Subject: [PATCH 01/29] Introduce controller for loading the web-extension js
 bundle

---
 appinfo/application.php           |  9 ++++
 appinfo/routes.php                |  1 +
 controller/webassetcontroller.php | 86 +++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 controller/webassetcontroller.php

diff --git a/appinfo/application.php b/appinfo/application.php
index bd7f5341..911484d5 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -32,6 +32,7 @@
 use OCA\Onlyoffice\Controller\SettingsApiController;
 use OCA\Onlyoffice\Controller\SettingsController;
 use OCA\Onlyoffice\Controller\TemplateController;
+use OCA\Onlyoffice\Controller\WebAssetController;
 use OCA\Onlyoffice\Crypt;
 use OCA\Onlyoffice\Hookhandler;
 use OCA\Onlyoffice\Hooks;
@@ -221,6 +222,14 @@ function () {
             );
         });
 
+        $container->registerService("WebAssetController", function ($c) {
+            return new WebAssetController(
+                $c->query("AppName"),
+                $c->query("Request"),
+                $c->query("Logger")
+            );
+        });
+
 
         Hooks::connectHooks();
     }
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 176106ff..c9b5a7ab 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -41,6 +41,7 @@
        ["name" => "template#add_template", "url" => "/ajax/template", "verb" => "POST"],
        ["name" => "template#get_templates", "url" => "/ajax/template", "verb" => "GET"],
        ["name" => "template#delete_template", "url" => "/ajax/template", "verb" => "DELETE"],
+       ["name" => "webasset#get", "url" => "/js/onlyoffice.js", "verb" => "GET"],
     ],
     "ocs" => [
         ["name" => "federation#key", "url" => "/api/v1/key", "verb" => "POST"],
diff --git a/controller/webassetcontroller.php b/controller/webassetcontroller.php
new file mode 100644
index 00000000..004efc80
--- /dev/null
+++ b/controller/webassetcontroller.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2021
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ *
+ */
+
+namespace OCA\Onlyoffice\Controller;
+
+use GuzzleHttp\Mimetypes;
+use OC\AppFramework\Http;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\DataDisplayResponse;
+use OCP\AppFramework\Http\DataDownloadResponse;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\Response;
+use OCP\ILogger;
+use OCP\IRequest;
+
+/**
+ * Class WebAssetController
+ *
+ * @package OCA\Onlyoffice\Controller
+ */
+class WebAssetController extends Controller {
+
+    /**
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * WebAssetController constructor.
+     *
+     * @param string $AppName - application name
+     * @param IRequest $request - request object
+     * @param ILogger $logger
+     */
+    public function __construct($AppName, IRequest $request, ILogger $logger) {
+        parent::__construct($AppName, $request);
+        $this->logger = $logger;
+    }
+
+    /**
+     * Loads the onlyoffice.js file for integration into ownCloud Web
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return Response
+     */
+    public function get(): Response {
+        $basePath = \dirname(__DIR__,1);
+        $filePath = \realpath( $basePath . '/js/web/onlyoffice.js');
+        try {
+            return new DataDisplayResponse(\file_get_contents($filePath), Http::STATUS_OK, [
+                'Content-Type' => $this->getMimeType($filePath),
+                'Content-Length' => \filesize($filePath),
+                'Cache-Control' => 'max-age=0, no-cache, no-store, must-revalidate',
+                'Pragma' => 'no-cache',
+                'Expires' => 'Tue, 24 Sep 1985 22:15:00 GMT',
+                'X-Frame-Options' => 'DENY'
+            ]);
+        } catch(\Exception $e) {
+            $this->logger->logException($e, ['app' => $this->appName]);
+            return new DataResponse(["message" => $e->getMessage()], Http::STATUS_NOT_FOUND);
+        }
+    }
+
+    private function getMimeType(string $filename): string {
+        $mimeTypes = Mimetypes::getInstance();
+        return $mimeTypes->fromFilename($filename);
+    }
+}

From f896da533f65a2a87d347691ce10d33be2317c2c Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 13 Aug 2021 16:41:09 +0200
Subject: [PATCH 02/29] Update README.md to reflect the new config for ownCloud
 Web

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cd9696d9..213a72d0 100644
--- a/README.md
+++ b/README.md
@@ -123,11 +123,13 @@ To register the connector, use these lines:
 "external_apps": [
     {
         "id": "onlyoffice",
-        "path": "http(s)://<owncloud-10-server-address>/custom/onlyoffice/js/web/onlyoffice.js",
+        "path": "http(s)://<owncloud-10-server-address>/index.php/apps/onlyoffice/js/onlyoffice.js",
     }
 ]
 ```
 
+Depending on your webserver configuration you can drop the `index.php` segment from the url path.
+
 ## How it works
 
 The ONLYOFFICE integration follows the API documented [here](https://api.onlyoffice.com/editors/basic):

From 25e5773aa42e03b070679e24d1493615c4212c1c Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 13 Aug 2021 16:45:45 +0200
Subject: [PATCH 03/29] Remove unused import

---
 controller/webassetcontroller.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/controller/webassetcontroller.php b/controller/webassetcontroller.php
index 004efc80..40c9605f 100644
--- a/controller/webassetcontroller.php
+++ b/controller/webassetcontroller.php
@@ -23,7 +23,6 @@
 use OC\AppFramework\Http;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataDisplayResponse;
-use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\ILogger;

From 3cb150240717cf381e11b13ffb40024131f66f78 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 31 Aug 2021 11:58:43 +0300
Subject: [PATCH 04/29] change downloadAs resource

---
 js/main.js      | 2 +-
 l10n/bg_BG.js   | 4 ++--
 l10n/bg_BG.json | 4 ++--
 l10n/de.js      | 4 ++--
 l10n/de.json    | 4 ++--
 l10n/de_DE.js   | 4 ++--
 l10n/de_DE.json | 4 ++--
 l10n/es.js      | 4 ++--
 l10n/es.json    | 4 ++--
 l10n/fr.js      | 4 ++--
 l10n/fr.json    | 4 ++--
 l10n/it.js      | 4 ++--
 l10n/it.json    | 4 ++--
 l10n/ja.js      | 4 ++--
 l10n/ja.json    | 4 ++--
 l10n/pl.js      | 4 ++--
 l10n/pl.json    | 4 ++--
 l10n/pt_BR.js   | 4 ++--
 l10n/pt_BR.json | 4 ++--
 l10n/ru.js      | 4 ++--
 l10n/ru.json    | 4 ++--
 l10n/sv.js      | 4 ++--
 l10n/sv.json    | 4 ++--
 l10n/zh_CN.js   | 4 ++--
 l10n/zh_CN.json | 4 ++--
 25 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/js/main.js b/js/main.js
index bd9c9d27..0b42e1ce 100644
--- a/js/main.js
+++ b/js/main.js
@@ -202,7 +202,7 @@
                     dialog_title: t("onlyoffice", "Download as")
                 });
 
-                $(dialog[0].querySelectorAll("p")).text(fileName + " " + t(OCA.Onlyoffice.AppName, "Convert into"));
+                $(dialog[0].querySelectorAll("p")).text(t(OCA.Onlyoffice.AppName, "Choose a format to convert {fileName}", {fileName: fileName}));
 
                 var extension = OCA.Onlyoffice.GetFileExtension(fileName);
                 var selectNode = dialog[0].querySelectorAll("select")[0];
diff --git a/l10n/bg_BG.js b/l10n/bg_BG.js
index e93ea482..c68d1ec9 100644
--- a/l10n/bg_BG.js
+++ b/l10n/bg_BG.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "Файлът бе преобразуван. Съдържанието му може да изглежда различно.",
     "Download as": "Изтегли като",
     "Download": "Изтегли",
-    "Convert into": "Конвертирай в",
     "Origin format": "Формат на произход",
     "Failed to send notification": "Неуспешно изпращане на известие",
     "Notification sent successfully": "Успешно изпратено известие",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s, споменат във %2\$s: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s, споменат във %2\$s: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/bg_BG.json b/l10n/bg_BG.json
index 49b62066..d3e2ceca 100644
--- a/l10n/bg_BG.json
+++ b/l10n/bg_BG.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "Файлът бе преобразуван. Съдържанието му може да изглежда различно.",
     "Download as": "Изтегли като",
     "Download": "Изтегли",
-    "Convert into": "Конвертирай в",
     "Origin format": "Формат на произход",
     "Failed to send notification": "Неуспешно изпращане на известие",
     "Notification sent successfully": "Успешно изпратено известие",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s, споменат във %2$s: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s, споменат във %2$s: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/de.js b/l10n/de.js
index c79ac0fe..40697b93 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "Die Datei wurde konvertiert. Der Inhalt könnte anders aussehen.",
     "Download as": "Herunterladen als",
     "Download": "Herunterladen",
-    "Convert into": "Konvertieren in",
     "Origin format": "Ursprüngliches Format",
     "Failed to send notification": "Fehler beim Senden einer Benachrichtigung",
     "Notification sent successfully": "Benachrichtigung erfolgreich gesendet",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 5cef54ce..f397741e 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "Die Datei wurde konvertiert. Der Inhalt könnte anders aussehen.",
     "Download as": "Herunterladen als",
     "Download": "Herunterladen",
-    "Convert into": "Konvertieren in",
     "Origin format": "Ursprüngliches Format",
     "Failed to send notification": "Fehler beim Senden einer Benachrichtigung",
     "Notification sent successfully": "Benachrichtigung erfolgreich gesendet",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index f69ddcc1..5a2d8ff9 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "Die Datei wurde konvertiert. Der Inhalt könnte anders aussehen.",
     "Download as": "Herunterladen als",
     "Download": "Herunterladen",
-    "Convert into": "Konvertieren in",
     "Origin format": "Ursprüngliches Format",
     "Failed to send notification": "Fehler beim Senden einer Benachrichtigung",
     "Notification sent successfully": "Benachrichtigung erfolgreich gesendet",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 43af5e1a..55e7d1e3 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "Die Datei wurde konvertiert. Der Inhalt könnte anders aussehen.",
     "Download as": "Herunterladen als",
     "Download": "Herunterladen",
-    "Convert into": "Konvertieren in",
     "Origin format": "Ursprüngliches Format",
     "Failed to send notification": "Fehler beim Senden einer Benachrichtigung",
     "Notification sent successfully": "Benachrichtigung erfolgreich gesendet",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
index c946884d..6b4248f5 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "El archivo se ha convertido. Su contenido puede ser distinto.",
     "Download as": "Descargar como",
     "Download": "Descargar",
-    "Convert into": "Convertir en",
     "Origin format": "Formato original",
     "Failed to send notification": "Error al enviar la notificación",
     "Notification sent successfully": "Notificación enviada correctamente",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha mencionado en %2\$s: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha mencionado en %2\$s: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index d038b026..528c37a1 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "El archivo se ha convertido. Su contenido puede ser distinto.",
     "Download as": "Descargar como",
     "Download": "Descargar",
-    "Convert into": "Convertir en",
     "Origin format": "Formato original",
     "Failed to send notification": "Error al enviar la notificación",
     "Notification sent successfully": "Notificación enviada correctamente",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha mencionado en %2$s: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha mencionado en %2$s: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/fr.js b/l10n/fr.js
index c6d5a65b..627bd99d 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "Le fichier a été converti. Son contenu peut s'afficher différemment.",
     "Download as": "Télécharger sous",
     "Download": "Télécharger",
-    "Convert into": "Convertir en",
     "Origin format": "Format d’origin",
     "Failed to send notification": "Échec de l’envoi de la notification",
     "Notification sent successfully": "Notification a été envoyée avec succès",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s a mentionné dans %2\$s: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s a mentionné dans %2\$s: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index aeeff886..43ec20d4 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "Le fichier a été converti. Son contenu peut s'afficher différemment.",
     "Download as": "Télécharger sous",
     "Download": "Télécharger",
-    "Convert into": "Convertir en",
     "Origin format": "Format d’origin",
     "Failed to send notification": "Échec de l’envoi de la notification",
     "Notification sent successfully": "Notification a été envoyée avec succès",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s a mentionné dans %2$s: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s a mentionné dans %2$s: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/it.js b/l10n/it.js
index eec375e4..0b99c0ed 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "Il file è stato convertito. Il suo contenuto potrebbe avere un aspetto diverso.",
     "Download as": "Scaricare come",
     "Download": "Scaricare",
-    "Convert into": "Convertire in",
     "Origin format": "Formato di origine",
     "Failed to send notification": "Invio di notifica non riuscito",
     "Notification sent successfully": "Notifica è stata inviata con successo",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha menzionato in %2\$s: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha menzionato in %2\$s: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}"
 },
 "nplurals=2; plural=(n != 1);");
\ No newline at end of file
diff --git a/l10n/it.json b/l10n/it.json
index c7f9b3eb..8e48af69 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "Il file è stato convertito. Il suo contenuto potrebbe avere un aspetto diverso.",
     "Download as": "Scaricare come",
     "Download": "Scaricare",
-    "Convert into": "Convertire in",
     "Origin format": "Formato di origine",
     "Failed to send notification": "Invio di notifica non riuscito",
     "Notification sent successfully": "Notifica è stata inviata con successo",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha menzionato in %2$s: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha menzionato in %2$s: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ja.js b/l10n/ja.js
index c0e45664..30941070 100644
--- a/l10n/ja.js
+++ b/l10n/ja.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "ファイルが変換されました。 その内容は異なって見えるかもしれません。",
     "Download as": "別の形式でダウンロード",
     "Download": "ダウンロード",
-    "Convert into": "に変換する",
     "Origin format": "オリジンの形式",
     "Failed to send notification": "通知を送信できませんでした",
     "Notification sent successfully": "通知を送信しました",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s は %2\$s: \"%3\$s\"に記載されました。"
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s は %2\$s: \"%3\$s\"に記載されました。",
+    "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/ja.json b/l10n/ja.json
index b2862fc4..d7699980 100644
--- a/l10n/ja.json
+++ b/l10n/ja.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "ファイルが変換されました。 その内容は異なって見えるかもしれません。",
     "Download as": "別の形式でダウンロード",
     "Download": "ダウンロード",
-    "Convert into": "に変換する",
     "Origin format": "オリジンの形式",
     "Failed to send notification": "通知を送信できませんでした",
     "Notification sent successfully": "通知を送信しました",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s は %2$s: \"%3$s\"に記載されました。"
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s は %2$s: \"%3$s\"に記載されました。",
+    "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/pl.js b/l10n/pl.js
index 6491caa8..0f8247b4 100644
--- a/l10n/pl.js
+++ b/l10n/pl.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "Plik został przekonwertowany. Jego zawartość może wyglądać inaczej.",
     "Download as": "Pobierz jako",
     "Download": "Pobierz",
-    "Convert into": "Konwertuj do",
     "Origin format": "Oryginalny format",
     "Failed to send notification": "Nie udało się wysłać powiadomienia",
     "Notification sent successfully": "Powiadomienie zostało wysłane",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s dodał(a) w %2\$s następujący komentarz: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s dodał(a) w %2\$s następujący komentarz: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}"
 },
 "nplurals=2; plural=(n != 1);");
\ No newline at end of file
diff --git a/l10n/pl.json b/l10n/pl.json
index 1487e386..c53675a4 100644
--- a/l10n/pl.json
+++ b/l10n/pl.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "Plik został przekonwertowany. Jego zawartość może wyglądać inaczej.",
     "Download as": "Pobierz jako",
     "Download": "Pobierz",
-    "Convert into": "Konwertuj do",
     "Origin format": "Oryginalny format",
     "Failed to send notification": "Nie udało się wysłać powiadomienia",
     "Notification sent successfully": "Powiadomienie zostało wysłane",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s dodał(a) w %2$s następujący komentarz: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s dodał(a) w %2$s następujący komentarz: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index d68fc338..ba88c97f 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "O arquivo foi convertido. Seu conteúdo pode ser diferente.",
     "Download as": "Baixar",
     "Download": "Baixar como",
-    "Convert into": "Converter em",
     "Origin format": "Formato de origem",
     "Failed to send notification": "Falha ao enviar notificação",
     "Notification sent successfully": "Notificação enviada com sucesso",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s mencionado em %2\$s: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s mencionado em %2\$s: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 7e8f8c9f..40beca80 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "O arquivo foi convertido. Seu conteúdo pode ser diferente.",
     "Download as": "Baixar",
     "Download": "Baixar como",
-    "Convert into": "Converter em",
     "Origin format": "Formato de origem",
     "Failed to send notification": "Falha ao enviar notificação",
     "Notification sent successfully": "Notificação enviada com sucesso",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s mencionado em %2$s: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s mencionado em %2$s: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/ru.js b/l10n/ru.js
index f62e55b9..029c8f38 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "Файл был сконвертирован. Его форматирование могло измениться.",
     "Download as": "Скачать как",
     "Download": "Скачать",
-    "Convert into": "Конвертировать в",
     "Origin format": "Оригинальный формат",
     "Failed to send notification": "Ошибка отправки оповещения",
     "Notification sent successfully": "Оповещение успешно отправлено",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s упомянул в %2\$s: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s упомянул в %2\$s: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Выберите формат для {fileName}"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/ru.json b/l10n/ru.json
index c2ccca0b..7cbe7894 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "Файл был сконвертирован. Его форматирование могло измениться.",
     "Download as": "Скачать как",
     "Download": "Скачать",
-    "Convert into": "Конвертировать в",
     "Origin format": "Оригинальный формат",
     "Failed to send notification": "Ошибка отправки оповещения",
     "Notification sent successfully": "Оповещение успешно отправлено",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s упомянул в %2$s: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s упомянул в %2$s: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Выберите формат для {fileName}"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/l10n/sv.js b/l10n/sv.js
index 3f7c2352..241f9a84 100644
--- a/l10n/sv.js
+++ b/l10n/sv.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "Filen har konverterats. Dess innehåll kan se annorlunda ut.",
     "Download as": "Ladda ned som",
     "Download": "Ladda ned",
-    "Convert into": "Konvertera till",
     "Origin format": "Ursprungsformat",
     "Failed to send notification": "Det gick inte att skicka aviseringen",
     "Notification sent successfully": "Aviseringen har skickats",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s har nämnt i %2\$s: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s har nämnt i %2\$s: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/sv.json b/l10n/sv.json
index 4f2561ab..1345c951 100644
--- a/l10n/sv.json
+++ b/l10n/sv.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "Filen har konverterats. Dess innehåll kan se annorlunda ut.",
     "Download as": "Ladda ned som",
     "Download": "Ladda ned",
-    "Convert into": "Konvertera till",
     "Origin format": "Ursprungsformat",
     "Failed to send notification": "Det gick inte att skicka aviseringen",
     "Notification sent successfully": "Aviseringen har skickats",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s har nämnt i %2$s: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s har nämnt i %2$s: \"%3$s\".",
+    "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index b59a7c21..fcedd10b 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -94,10 +94,10 @@ OC.L10N.register(
     "File has been converted. Its content might look different.": "文件已被转换。其内容可能看起来有所不同。",
     "Download as": "下载为",
     "Download": "下载",
-    "Convert into": "转换为",
     "Origin format": "原产地格式",
     "Failed to send notification": "发送通知失败",
     "Notification sent successfully": "通知发送成功",
-    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s 提到 %2\$s: \"%3\$s\"."
+    "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s 提到 %2\$s: \"%3\$s\".",
+    "Choose a format to convert {fileName}": "选择要转换{fileName}的格式"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 62c6685e..8e4e748b 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -92,10 +92,10 @@
     "File has been converted. Its content might look different.": "文件已被转换。其内容可能看起来有所不同。",
     "Download as": "下载为",
     "Download": "下载",
-    "Convert into": "转换为",
     "Origin format": "原产地格式",
     "Failed to send notification": "发送通知失败",
     "Notification sent successfully": "通知发送成功",
-    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s 提到 %2$s: \"%3$s\"."
+    "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s 提到 %2$s: \"%3$s\".",
+    "Choose a format to convert {fileName}": "选择要转换{fileName}的格式"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file

From c431c2b530866768ebc6d377069682395f486697 Mon Sep 17 00:00:00 2001
From: svetlana maleeva <svetlana.maleeva@onlyoffice.com>
Date: Tue, 31 Aug 2021 15:30:04 +0300
Subject: [PATCH 05/29] Update download links, prices link and helpcenter links

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 213a72d0..e32a4b00 100644
--- a/README.md
+++ b/README.md
@@ -27,13 +27,13 @@ ONLYOFFICE Document Server and ownCloud can be installed either on different com
 
 You can install free Community version of ONLYOFFICE Docs or scalable Enterprise Edition with pro features.
 
-To install free Community version, use [Docker](https://github.com/onlyoffice/Docker-DocumentServer) (recommended) or follow [these instructions](https://helpcenter.onlyoffice.com/server/linux/document/linux-installation.aspx) for Debian, Ubuntu, or derivatives.  
+To install free Community version, use [Docker](https://github.com/onlyoffice/Docker-DocumentServer) (recommended) or follow [these instructions](https://helpcenter.onlyoffice.com/installation/docs-community-install-ubuntu.aspx) for Debian, Ubuntu, or derivatives.  
 
-To install Enterprise Edition, follow instructions [here](https://helpcenter.onlyoffice.com/server/integration-edition/index.aspx).
+To install Enterprise Edition, follow instructions [here](https://helpcenter.onlyoffice.com/installation/docs-enterprise-index.aspx).
 
 Community Edition vs Enterprise Edition comparison can be found [here](#onlyoffice-docs-editions).
 
-To use ONLYOFFICE behind a proxy, please refer to [this article](https://helpcenter.onlyoffice.com/server/document/document-server-proxy.aspx).
+To use ONLYOFFICE behind a proxy, please refer to [this article](https://helpcenter.onlyoffice.com/installation/docs-community-proxy.aspx).
 
 You can also use our **[Docker installation](https://github.com/ONLYOFFICE/docker-onlyoffice-owncloud)** to install pre-configured Document Server (free version) and ownCloud with a couple of commands.
 
@@ -198,13 +198,13 @@ The table below will help you to make the right choice.
 
 | Pricing and licensing | Community Edition | Enterprise Edition |
 | ------------- | ------------- | ------------- |
-| | [Get it now](https://www.onlyoffice.com/download.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud)  | [Start Free Trial](https://www.onlyoffice.com/enterprise-edition-free.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud)  |
-| Cost  | FREE  | [Go to the pricing page](https://www.onlyoffice.com/enterprise-edition.aspx??utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud)  |
+| | [Get it now](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud#docs-community)  | [Start Free Trial](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud#docs-enterprise)  |
+| Cost  | FREE  | [Go to the pricing page](https://www.onlyoffice.com/docs-enterprise-prices.aspx??utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud)  |
 | Simultaneous connections | up to 20 maximum  | As in chosen pricing plan |
 | Number of users | up to 20 recommended | As in chosen pricing plan |
 | License | GNU AGPL v.3 | Proprietary |
 | **Support** | **Community Edition** | **Enterprise Edition** |
-| Documentation | [Help Center](https://helpcenter.onlyoffice.com/server/docker/opensource/index.aspx) | [Help Center](https://helpcenter.onlyoffice.com/server/integration-edition/index.aspx) |
+| Documentation | [Help Center](https://helpcenter.onlyoffice.com/installation/docs-community-index.aspx) | [Help Center](https://helpcenter.onlyoffice.com/installation/docs-enterprise-index.aspx) |
 | Standard support | [GitHub](https://github.com/ONLYOFFICE/DocumentServer/issues) or paid | One year support included |
 | Premium support | [Buy Now](https://www.onlyoffice.com/support.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud) | [Buy Now](https://www.onlyoffice.com/support.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud) |
 | **Services** | **Community Edition** | **Enterprise Edition** |
@@ -252,7 +252,7 @@ The table below will help you to make the right choice.
 | Transitions                     | + | + |
 | Presenter mode                  | + | + |
 | Notes                           | + | + |
-| | [Get it now](https://www.onlyoffice.com/download.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud)  | [Start Free Trial](https://www.onlyoffice.com/enterprise-edition-free.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud)  |
+| | [Get it now](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud#docs-community)  | [Start Free Trial](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud#docs-enterprise)  |
 
 \*  It's possible to add documents for comparison from your local drive, from URL and from ownCloud storage.
 

From 1bfc81e80c707708c785a02d7786f218c1a2d5ad Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Tue, 7 Sep 2021 11:42:48 +0300
Subject: [PATCH 06/29] open share link directly (Fix #334)

---
 CHANGELOG.md |  3 +++
 js/main.js   | 26 ++++++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23addfdc..be7a05b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## Changed
+- open share link directly
+
 ## 7.1.1
 ## Added
 - support ownCloud Web
diff --git a/js/main.js b/js/main.js
index 0b42e1ce..3b15668b 100644
--- a/js/main.js
+++ b/js/main.js
@@ -434,16 +434,26 @@
                     return;
                 }
 
-                var button = document.createElement("a");
-                button.href = OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/s/" + encodeURIComponent($("#sharingToken").val()));
-                button.className = "onlyoffice-public-open button";
-                button.innerText = t(OCA.Onlyoffice.AppName, "Open in ONLYOFFICE")
+                var editorUrl = OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/s/" + encodeURIComponent($("#sharingToken").val()));
 
-                if (!OCA.Onlyoffice.setting.sameTab) {
-                    button.target = "_blank";
-                }
+                if (oc_appswebroots.richdocuments
+                    || oc_appswebroots.files_pdfviewer && extension === "pdf"
+                    || oc_appswebroots.files_texteditor && extension === "txt") {
+
+                    var button = document.createElement("a");
+                    button.href = editorUrl;
+                    button.className = "onlyoffice-public-open button";
+                    button.innerText = t(OCA.Onlyoffice.AppName, "Open in ONLYOFFICE")
 
-                $("#preview").prepend(button);
+                    if (!OCA.Onlyoffice.setting.sameTab) {
+                        button.target = "_blank";
+                    }
+
+                    $("#preview").prepend(button);
+                } else {
+                    var $iframe = $("<iframe id=\"onlyofficeFrame\" nonce=\"" + btoa(OC.requestToken) + "\" scrolling=\"no\" allowfullscreen src=\"" + editorUrl + "?inframe=true\" />");
+                    $("#preview").append($iframe);
+                }
             };
 
             OCA.Onlyoffice.GetSettings(initSharedButton);

From 60709e05913da482b59f123e5e048cc432c0e173 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Wed, 15 Sep 2021 19:32:12 +0300
Subject: [PATCH 07/29] restore version

---
 appinfo/routes.php                 |  1 +
 controller/editorapicontroller.php |  8 ++++
 controller/editorcontroller.php    | 55 +++++++++++++++++++++
 js/editor.js                       | 76 +++++++++++++++++++-----------
 lib/version.php                    | 18 +++++++
 lib/versionmanager.php             | 26 ++++++++++
 6 files changed, 157 insertions(+), 27 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index c9b5a7ab..ef1946e0 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -34,6 +34,7 @@
        ["name" => "editor#url", "url" => "/ajax/url", "verb" => "GET"],
        ["name" => "editor#history", "url" => "/ajax/history", "verb" => "GET"],
        ["name" => "editor#version", "url" => "/ajax/version", "verb" => "GET"],
+       ["name" => "editor#restore", "url" => "/ajax/restore", "verb" => "PUT"],
        ["name" => "settings#save_address", "url" => "/ajax/settings/address", "verb" => "PUT"],
        ["name" => "settings#save_common", "url" => "/ajax/settings/common", "verb" => "PUT"],
        ["name" => "settings#get_settings", "url" => "/ajax/settings", "verb" => "GET"],
diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php
index 712f01b3..df051dab 100644
--- a/controller/editorapicontroller.php
+++ b/controller/editorapicontroller.php
@@ -394,6 +394,14 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
             $params["type"] = "mobile";
         }
 
+        if (!$template
+            && $file->isUpdateable()
+            && !$isPersistentLock
+            && (empty($shareToken) || ($share->getPermissions() & Constants::PERMISSION_UPDATE) === Constants::PERMISSION_UPDATE)) {
+
+            $params["document"]["permissions"]["changeHistory"] = true;
+        }
+
         if (!empty($userId)) {
             $params["editorConfig"]["user"] = [
                 "id" => $this->buildUserId($userId),
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 6738d978..d0170900 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -796,6 +796,61 @@ public function version($fileId, $version, $shareToken = null) {
         return $result;
     }
 
+    /**
+     * Restore file version
+     *
+     * @param integer $fileId - file identifier
+     * @param integer $version - file version
+     * @param string $shareToken - access token
+     *
+     * @return array
+     *
+     * @NoAdminRequired
+     * @PublicPage
+     */
+    public function restore($fileId, $version, $shareToken = null) {
+        $this->logger->debug("Request restore version for: $fileId ($version)", ["app" => $this->appName]);
+
+        if (empty($shareToken) && !$this->config->isUserAllowedToUse()) {
+            return ["error" => $this->trans->t("Not permitted")];
+        }
+
+        $version = empty($version) ? null : $version;
+
+        $user = $this->userSession->getUser();
+        $userId = null;
+        if (!empty($user)) {
+            $userId = $user->getUID();
+        }
+
+        list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken);
+
+        if (isset($error)) {
+            $this->logger->error("Restore: $fileId $error", ["app" => $this->appName]);
+            return ["error" => $error];
+        }
+
+        if ($fileId === 0) {
+            $fileId = $file->getId();
+        }
+
+        $owner = null;
+        $versions = array();
+        if ($this->versionManager->available) {
+            $owner = $file->getFileInfo()->getOwner();
+            if ($owner !== null) {
+                $versions = array_reverse($this->versionManager->getVersionsForFile($owner, $file->getFileInfo()));
+            }
+
+            if (count($versions) >= $version) {
+                $fileVersion = array_values($versions)[$version - 1];
+                $this->versionManager->rollback($fileVersion);
+            }
+        }
+
+        return $this->history($fileId, $shareToken);
+    }
+
     /**
      * Get presigned url to file
      *
diff --git a/js/editor.js b/js/editor.js
index 9e349ac8..1eff9ea2 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -122,6 +122,7 @@
                     if (!OCA.Onlyoffice.template) {
                         config.events.onRequestHistory = OCA.Onlyoffice.onRequestHistory;
                         config.events.onRequestHistoryData = OCA.Onlyoffice.onRequestHistoryData;
+                        config.events.onRequestRestore = OCA.Onlyoffice.onRequestRestore;
 
                         if (!OCA.Onlyoffice.version) {
                             config.events.onRequestHistoryClose = OCA.Onlyoffice.onRequestHistoryClose;
@@ -176,33 +177,7 @@
                 shareToken: OCA.Onlyoffice.shareToken || "",
             }),
             function onSuccess(response) {
-                if (response.error) {
-                    var data = {error: response.error};
-                } else {
-                    var currentVersion = 0;
-                    $.each(response, function (i, fileVersion) {
-                        if (fileVersion.version >= currentVersion) {
-                            currentVersion = fileVersion.version;
-                        }
-
-                        fileVersion.created = moment(fileVersion.created * 1000).format("L LTS");
-                        if (fileVersion.changes) {
-                            $.each(fileVersion.changes, function (j, change) {
-                                change.created = moment(change.created + "+00:00").format("L LTS");
-                            });
-                        }
-                    });
-
-                    if (version) {
-                        currentVersion = Math.min(currentVersion, version);
-                    }
-
-                    data = {
-                        currentVersion: currentVersion,
-                        history: response,
-                    };
-                }
-                OCA.Onlyoffice.docEditor.refreshHistory(data);
+                OCA.Onlyoffice.refreshHistory(response, version);
         });
     };
 
@@ -226,6 +201,23 @@
         });
     };
 
+    OCA.Onlyoffice.onRequestRestore = function (event) {
+        var version = event.data.version;
+
+        $.ajax({
+            method: "PUT",
+            url: OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/restore"),
+            data: {
+                fileId: OCA.Onlyoffice.fileId || 0,
+                version: version,
+                shareToken: OCA.Onlyoffice.shareToken || "",
+            },
+            success: function onSuccess(response) {
+                OCA.Onlyoffice.refreshHistory(response, version);
+            }
+        })
+    };
+
     OCA.Onlyoffice.onRequestHistoryClose = function () {
         location.reload(true);
     };
@@ -510,6 +502,36 @@
         }
     }
 
+    OCA.Onlyoffice.refreshHistory = function (response, version) {
+        if (response.error) {
+            var data = {error: response.error};
+        } else {
+            var currentVersion = 0;
+            $.each(response, function (i, fileVersion) {
+                if (fileVersion.version >= currentVersion) {
+                    currentVersion = fileVersion.version;
+                }
+
+                fileVersion.created = moment(fileVersion.created * 1000).format("L LTS");
+                if (fileVersion.changes) {
+                    $.each(fileVersion.changes, function (j, change) {
+                        change.created = moment(change.created + "+00:00").format("L LTS");
+                    });
+                }
+            });
+
+            if (version) {
+                currentVersion = Math.min(currentVersion, version);
+            }
+
+            data = {
+                currentVersion: currentVersion,
+                history: response,
+            };
+        }
+        OCA.Onlyoffice.docEditor.refreshHistory(data);
+    }
+
     $(document).ready(OCA.Onlyoffice.InitEditor);
 
 })(jQuery, OCA);
diff --git a/lib/version.php b/lib/version.php
index d1988373..b1ea60d6 100644
--- a/lib/version.php
+++ b/lib/version.php
@@ -42,6 +42,13 @@ class Version {
      * */
     private $revisionId;
 
+    /** 
+     * File path
+     *
+     * @var string 
+     * */
+    private $path;
+
     /** 
      * Source file properties
      * 
@@ -56,10 +63,12 @@ class Version {
      */
     public function __construct(int $timestamp,
                                 int $revisionId,
+                                string $path,
                                 FileInfo $sourceFileInfo
                                 ) {
         $this->timestamp = $timestamp;
         $this->revisionId = $revisionId;
+        $this->path = $path;
         $this->sourceFileInfo = $sourceFileInfo;
     }
 
@@ -89,4 +98,13 @@ public function getRevisionId() {
     public function getTimestamp() {
         return $this->timestamp;
     }
+
+    /**
+     * Get file path
+     *
+     * @return string
+     */
+    public function getPath() {
+        return $this->path;
+    }
 }
diff --git a/lib/versionmanager.php b/lib/versionmanager.php
index 4439ee32..c41b34ee 100644
--- a/lib/versionmanager.php
+++ b/lib/versionmanager.php
@@ -153,6 +153,7 @@ public function getVersionsForFile($user, $file) {
         foreach($propsVersions as $propVersion) {
             $version = new Version($propVersion["timestamp"],
                                     $propVersion["version"],
+                                    $propVersion["path"],
                                     $file);
 
             array_push($versions, $version);
@@ -160,4 +161,29 @@ public function getVersionsForFile($user, $file) {
 
         return $versions;
     }
+
+    /**
+     * Restore version
+     *
+     * @param Version $version - version for restore
+     *
+     */
+    public function rollback($version) {
+       $sourceFile = $version->getSourceFile();
+
+       $ownerId = null;
+       $owner = $sourceFile->getOwner();
+       if (!empty($owner)) {
+           $ownerId = $owner->getUID();
+       }
+
+       $path = $version->getPath();
+       $revision = $version->getTimestamp();
+
+       $versionFile = $this->getVersionFile($owner, $sourceFile, $revision);
+       $versionFileInfo = $versionFile->getFileInfo();
+       $versionPath = $versionFileInfo->getInternalPath();
+
+       $this->storage->restoreVersion($ownerId, $path, $versionPath, $revision);
+    }
 }

From e9b5ca3278a1b12fd2ccd4f1cbd1bab43aefc1f6 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Thu, 16 Sep 2021 11:43:24 +0300
Subject: [PATCH 08/29] refresh versionsTab

---
 js/editor.js   |  7 +++++++
 js/listener.js |  5 +++++
 js/main.js     | 10 ++++++++++
 3 files changed, 22 insertions(+)

diff --git a/js/editor.js b/js/editor.js
index 1eff9ea2..5c40ce2f 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -214,6 +214,13 @@
             },
             success: function onSuccess(response) {
                 OCA.Onlyoffice.refreshHistory(response, version);
+
+                if (OCA.Onlyoffice.inframe) {
+                    window.parent.postMessage({
+                        method: "onRefreshVersionsDialog"
+                    },
+                    "*");
+                }
             }
         })
     };
diff --git a/js/listener.js b/js/listener.js
index c4dda17b..4cffeb8f 100644
--- a/js/listener.js
+++ b/js/listener.js
@@ -86,6 +86,11 @@
                     OCA.Onlyoffice.OpenShareDialog();
                 }
                 break;
+            case "onRefreshVersionsDialog":
+                if (OCA.Onlyoffice.RefreshVersionsDialog) {
+                    OCA.Onlyoffice.RefreshVersionsDialog();
+                }
+                break;
             case "editorRequestSaveAs":
                 OCA.Onlyoffice.onRequestSaveAs(event.data.param);
                 break;
diff --git a/js/main.js b/js/main.js
index 0b42e1ce..aa1d94e6 100644
--- a/js/main.js
+++ b/js/main.js
@@ -150,6 +150,16 @@
         }
     };
 
+    OCA.Onlyoffice.RefreshVersionsDialog = function () {
+        if (OCA.Onlyoffice.context) {
+            if ($("#app-content").hasClass("with-app-sidebar")) {
+                OC.Apps.hideAppSidebar();
+                OCA.Onlyoffice.context.fileList.showDetailsView(OCA.Onlyoffice.context.fileName, "versionsTabView");
+                OC.Apps.showAppSidebar();
+            }
+        }
+    };
+
     OCA.Onlyoffice.FileClick = function (fileName, context) {
         var fileInfoModel = context.fileInfoModel || context.fileList.getModelForFile(fileName);
         OCA.Onlyoffice.OpenEditor(fileInfoModel.id, context.dir, fileName);

From cdd76931f33f1fc106ac2d14053f62dda48d8fd7 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Thu, 16 Sep 2021 11:51:00 +0300
Subject: [PATCH 09/29] version restore to changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23addfdc..906d0d7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## Added
+- versions restore from editor
+
 ## 7.1.1
 ## Added
 - support ownCloud Web

From dd8e709c01064ed7441749f36c6b5dd9b9a6fb56 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Thu, 16 Sep 2021 13:10:51 +0300
Subject: [PATCH 10/29] check allow groups when opening share link

---
 controller/editorcontroller.php | 10 +++++++++-
 lib/appconfig.php               | 15 ++++++++++++---
 lib/fileutility.php             |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 6738d978..9ab22933 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -962,7 +962,15 @@ public function index($fileId, $filePath = null, $shareToken = null, $version =
             return new RedirectResponse($redirectUrl);
         }
 
-        if (empty($shareToken) && !$this->config->isUserAllowedToUse()) {
+        $shareBy = null;
+        if (!empty($shareToken) && !$this->userSession->isLoggedIn()) {
+            list ($share, $error) = $this->fileUtility->getShare($shareToken);
+            if (!empty($share)) {
+                $shareBy = $share->getSharedBy();
+            }
+        }
+
+        if (!$this->config->isUserAllowedToUse($shareBy)) {
             return $this->renderError($this->trans->t("Not permitted"));
         }
 
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 8e69f8b7..005ba452 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -841,12 +841,14 @@ public function GetLimitGroups() {
     /**
      * Check access for group
      *
+     * @param string $userId - user identifier
+     *
      * @return bool
      */
-    public function isUserAllowedToUse() {
+    public function isUserAllowedToUse($userId = null) {
         // no user -> no
         $userSession = \OC::$server->getUserSession();
-        if ($userSession === null || !$userSession->isLoggedIn()) {
+        if (is_null($userId) && ($userSession === null || !$userSession->isLoggedIn())) {
             return false;
         }
 
@@ -856,7 +858,14 @@ public function isUserAllowedToUse() {
             return true;
         }
 
-        $user = $userSession->getUser();
+        if (is_null($userId)) {
+            $user = $userSession->getUser();
+        } else {
+            $user = \OC::$server->getUserManager()->get($userId);
+            if (empty($user)) {
+                return false;
+            }
+        }
 
         foreach ($groups as $groupName) {
             // group unknown -> error and allow nobody
diff --git a/lib/fileutility.php b/lib/fileutility.php
index 17d9f199..2dc3658f 100644
--- a/lib/fileutility.php
+++ b/lib/fileutility.php
@@ -184,7 +184,7 @@ public function getNodeByToken($shareToken) {
      *
      * @return array
      */
-    private function getShare($shareToken) {
+    public function getShare($shareToken) {
         if (empty($shareToken)) {
             return [null, $this->trans->t("FileId is empty")];
         }

From e2d9fb3fafea8577c44a11e0466d0828ac9de9b1 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Thu, 16 Sep 2021 13:29:58 +0300
Subject: [PATCH 11/29] check user allow groups in config

---
 controller/editorapicontroller.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php
index 712f01b3..a87d9aed 100644
--- a/controller/editorapicontroller.php
+++ b/controller/editorapicontroller.php
@@ -242,10 +242,6 @@ public function fillempty($fileId) {
      */
     public function config($fileId, $filePath = null, $shareToken = null, $version = 0, $inframe = false, $desktop = false, $template = false, $anchor = null) {
 
-        if (empty($shareToken) && !$this->config->isUserAllowedToUse()) {
-            return new JSONResponse(["error" => $this->trans->t("Not permitted")]);
-        }
-
         $user = $this->userSession->getUser();
         $userId = null;
         if (!empty($user)) {
@@ -259,6 +255,14 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
             return new JSONResponse(["error" => $error]);
         }
 
+        $checkUserAllowGroups = $userId;
+        if (!empty($share)) {
+            $checkUserAllowGroups = $share->getSharedBy();
+        }
+        if (!$this->config->isUserAllowedToUse($checkUserAllowGroups)) {
+            return new JSONResponse(["error" => $this->trans->t("Not permitted")]);
+        }
+
         $fileName = $file->getName();
         $ext = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
         $format = !empty($ext) ? $this->config->FormatsSetting()[$ext] : null;

From ee944a5d1e38ad9fdf897851ca9fff2fadac737c Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Thu, 16 Sep 2021 13:32:14 +0300
Subject: [PATCH 12/29] check group for link to changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23addfdc..a22f2870 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## Changed
+- editing by link only for available groups
+
 ## 7.1.1
 ## Added
 - support ownCloud Web

From 815f6b05dd6798a15799f700eedf410dc9fda71f Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Mon, 20 Sep 2021 18:56:06 +0300
Subject: [PATCH 13/29] get template folder directly

---
 lib/templatemanager.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/templatemanager.php b/lib/templatemanager.php
index d6751772..11b8eb2f 100644
--- a/lib/templatemanager.php
+++ b/lib/templatemanager.php
@@ -20,6 +20,7 @@
 namespace OCA\Onlyoffice;
 
 use OCP\Files\Folder;
+use OCP\Files\NotFoundException;
 
 /**
  * Template manager
@@ -48,10 +49,15 @@ class TemplateManager {
      * @return Folder
      */
     public static function GetGlobalTemplateDir() {
-        $rootFolder = \OC::$server->getRootFolder();
+        $dirPath = self::$appName . "/" . self::$templateFolderName;
 
-        $appDir = $rootFolder->nodeExists(self::$appName) ? $rootFolder->get(self::$appName) : $rootFolder->newFolder(self::$appName);
-        $templateDir = $appDir->nodeExists(self::$templateFolderName) ? $appDir->get(self::$templateFolderName) : $appDir->newFolder(self::$templateFolderName);
+        $rootFolder = \OC::$server->getRootFolder();
+        $templateDir = null;
+        try {
+            $templateDir = $rootFolder->get($dirPath);
+        } catch (NotFoundException $e) {
+            $templateDir = $rootFolder->newFolder($dirPath);
+        }
 
         return $templateDir;
     }

From 11afb3bcf89743c2be7359430dc784eeb3c750fc Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Fri, 24 Sep 2021 11:28:20 +0300
Subject: [PATCH 14/29] fix readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e32a4b00..578c60f8 100644
--- a/README.md
+++ b/README.md
@@ -199,7 +199,7 @@ The table below will help you to make the right choice.
 | Pricing and licensing | Community Edition | Enterprise Edition |
 | ------------- | ------------- | ------------- |
 | | [Get it now](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud#docs-community)  | [Start Free Trial](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud#docs-enterprise)  |
-| Cost  | FREE  | [Go to the pricing page](https://www.onlyoffice.com/docs-enterprise-prices.aspx??utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud)  |
+| Cost  | FREE  | [Go to the pricing page](https://www.onlyoffice.com/docs-enterprise-prices.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubOwncloud)  |
 | Simultaneous connections | up to 20 maximum  | As in chosen pricing plan |
 | Number of users | up to 20 recommended | As in chosen pricing plan |
 | License | GNU AGPL v.3 | Proprietary |

From 6bb07f5091a5f43dc312a2a300934c031cb365e1 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Mon, 20 Sep 2021 17:47:55 +0300
Subject: [PATCH 15/29] change documentType on word, cell, slide

---
 CHANGELOG.md                       |  1 +
 controller/editorapicontroller.php |  8 ++--
 controller/editorcontroller.php    |  4 +-
 js/listener.js                     |  2 +-
 lib/appconfig.php                  | 66 +++++++++++++++---------------
 5 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d366736d..25702d58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - versions restore from editor
 
 ## Changed
+- document server v6.0 and earlier is no longer supported
 - editing by link only for available groups
 - open share link directly
 
diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php
index 2e6ac9c8..59e124a5 100644
--- a/controller/editorapicontroller.php
+++ b/controller/editorapicontroller.php
@@ -440,14 +440,14 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
                 $folderLink = $this->urlGenerator->linkToRouteAbsolute("files.view.index", $linkAttr);
             }
 
-            switch($params["documentType"]) {
-                case "text":
+            switch ($params["documentType"]) {
+                case "word":
                     $createName = $this->trans->t("Document") . ".docx";
                     break;
-                case "spreadsheet":
+                case "cell":
                     $createName = $this->trans->t("Spreadsheet") . ".xlsx";
                     break;
-                case "presentation":
+                case "slide":
                     $createName = $this->trans->t("Presentation") . ".pptx";
                     break;
             }
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 20f0cb38..7754b4b3 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -461,10 +461,10 @@ public function convert($fileId, $shareToken = null) {
 
         $internalExtension = "docx";
         switch ($format["type"]) {
-            case "spreadsheet":
+            case "cell":
                 $internalExtension = "xlsx";
                 break;
-            case "presentation":
+            case "slide":
                 $internalExtension = "pptx";
                 break;
         }
diff --git a/js/listener.js b/js/listener.js
index 4cffeb8f..6bd905e7 100644
--- a/js/listener.js
+++ b/js/listener.js
@@ -65,7 +65,7 @@
     };
 
     OCA.Onlyoffice.onDocumentReady = function (documentType) {
-        if (documentType === "text") {
+        if (documentType === "word") {
             OCA.Onlyoffice.bindVersionClick();
         } else {
             OCA.Onlyoffice.unbindVersionClick();
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 005ba452..0ffeec11 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -1024,39 +1024,39 @@ public function ShareAttributesVersion() {
      * @var array
      */
     private $formats = [
-        "csv" => [ "mime" => "text/csv", "type" => "spreadsheet", "edit" => true, "editable" => true, "saveas" => ["ods", "pdf", "xlsx"] ],
-        "doc" => [ "mime" => "application/msword", "type" => "text", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
-        "docm" => [ "mime" => "application/vnd.ms-word.document.macroEnabled.12", "type" => "text", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
-        "docx" => [ "mime" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "type" => "text", "edit" => true, "def" => true, "review" => true, "fillForms" => true, "comment" => true, "saveas" => ["odt", "pdf", "rtf", "txt"] ],
-        "dot" => [ "type" => "text", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
-        "dotx" => [ "mime" => "application/vnd.openxmlformats-officedocument.wordprocessingml.template", "type" => "text", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
-        "epub" => [ "mime" => "application/epub+zip", "type" => "text", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
-        "htm" => [ "type" => "text", "conv" => true ],
-        "html" => [ "mime" => "text/html", "type" => "text", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
-        "odp" => [ "mime" => "application/vnd.oasis.opendocument.presentation", "type" => "presentation", "conv" => true, "editable" => true, "saveas" => ["pdf", "pptx"] ],
-        "ods" => [ "mime" => "application/vnd.oasis.opendocument.spreadsheet", "type" => "spreadsheet", "conv" => true, "editable" => true, "saveas" => ["csv", "pdf", "xlsx"] ],
-        "odt" => [ "mime" => "application/vnd.oasis.opendocument.text", "type" => "text", "conv" => true, "editable" => true, "saveas" => ["docx", "pdf", "rtf", "txt"] ],
-        "otp" => [ "mime" => "application/vnd.oasis.opendocument.presentation-template", "type" => "presentation", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
-        "ots" => [ "mime" => "application/vnd.oasis.opendocument.spreadsheet-template", "type" => "spreadsheet", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
-        "ott" => [ "mime" => "application/vnd.oasis.opendocument.text-template", "type" => "text", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
-        "pdf" => [ "mime" => "application/pdf", "type" => "text" ],
-        "pot" => [ "type" => "presentation", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
-        "potm" => [ "mime" => "application/vnd.ms-powerpoint.template.macroEnabled.12", "type" => "presentation", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
-        "potx" => [ "mime" => "application/vnd.openxmlformats-officedocument.presentationml.template", "type" => "presentation", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
-        "pps" => [ "type" => "presentation", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
-        "ppsm" => [ "mime" => "application/vnd.ms-powerpoint.slideshow.macroEnabled.12", "type" => "presentation", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
-        "ppsx" => [ "mime" => "application/vnd.openxmlformats-officedocument.presentationml.slideshow", "type" => "presentation", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
-        "ppt" => [ "mime" => "application/vnd.ms-powerpoint", "type" => "presentation", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
-        "pptm" => [ "mime" => "application/vnd.ms-powerpoint.presentation.macroEnabled.12", "type" => "presentation", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
-        "pptx" => [ "mime" => "application/vnd.openxmlformats-officedocument.presentationml.presentation", "type" => "presentation", "edit" => true, "def" => true, "comment" => true, "saveas" => ["pdf", "odp"] ],
-        "rtf" => [ "mime" => "text/rtf", "type" => "text", "conv" => true, "editable" => true, "saveas" => ["docx", "odt", "pdf", "txt"] ],
-        "txt" => [ "mime" => "text/plain", "type" => "text", "edit" => true, "editable" => true, "saveas" => ["docx", "odt", "pdf", "rtf"] ],
-        "xls" => [ "mime" => "application/vnd.ms-excel", "type" => "spreadsheet", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
-        "xlsm" => [ "mime" => "application/vnd.ms-excel.sheet.macroEnabled.12", "type" => "spreadsheet", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
-        "xlsx" => [ "mime" => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "type" => "spreadsheet", "edit" => true, "def" => true, "comment" => true, "modifyFilter" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
-        "xlt" => [ "type" => "spreadsheet", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
-        "xltm" => [ "mime" => "application/vnd.ms-excel.template.macroEnabled.12", "type" => "spreadsheet", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
-        "xltx" => [ "mime" => "application/vnd.openxmlformats-officedocument.spreadsheetml.template", "type" => "spreadsheet", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ]
+        "csv" => [ "mime" => "text/csv", "type" => "cell", "edit" => true, "editable" => true, "saveas" => ["ods", "pdf", "xlsx"] ],
+        "doc" => [ "mime" => "application/msword", "type" => "word", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
+        "docm" => [ "mime" => "application/vnd.ms-word.document.macroEnabled.12", "type" => "word", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
+        "docx" => [ "mime" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "type" => "word", "edit" => true, "def" => true, "review" => true, "fillForms" => true, "comment" => true, "saveas" => ["odt", "pdf", "rtf", "txt"] ],
+        "dot" => [ "type" => "word", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
+        "dotx" => [ "mime" => "application/vnd.openxmlformats-officedocument.wordprocessingml.template", "type" => "word", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
+        "epub" => [ "mime" => "application/epub+zip", "type" => "word", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
+        "htm" => [ "type" => "word", "conv" => true ],
+        "html" => [ "mime" => "text/html", "type" => "word", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
+        "odp" => [ "mime" => "application/vnd.oasis.opendocument.presentation", "type" => "slide", "conv" => true, "editable" => true, "saveas" => ["pdf", "pptx"] ],
+        "ods" => [ "mime" => "application/vnd.oasis.opendocument.spreadsheet", "type" => "cell", "conv" => true, "editable" => true, "saveas" => ["csv", "pdf", "xlsx"] ],
+        "odt" => [ "mime" => "application/vnd.oasis.opendocument.text", "type" => "word", "conv" => true, "editable" => true, "saveas" => ["docx", "pdf", "rtf", "txt"] ],
+        "otp" => [ "mime" => "application/vnd.oasis.opendocument.presentation-template", "type" => "slide", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
+        "ots" => [ "mime" => "application/vnd.oasis.opendocument.spreadsheet-template", "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
+        "ott" => [ "mime" => "application/vnd.oasis.opendocument.text-template", "type" => "word", "conv" => true, "saveas" => ["docx", "odt", "pdf", "rtf", "txt"] ],
+        "pdf" => [ "mime" => "application/pdf", "type" => "word" ],
+        "pot" => [ "type" => "slide", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
+        "potm" => [ "mime" => "application/vnd.ms-powerpoint.template.macroEnabled.12", "type" => "slide", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
+        "potx" => [ "mime" => "application/vnd.openxmlformats-officedocument.presentationml.template", "type" => "slide", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
+        "pps" => [ "type" => "slide", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
+        "ppsm" => [ "mime" => "application/vnd.ms-powerpoint.slideshow.macroEnabled.12", "type" => "slide", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
+        "ppsx" => [ "mime" => "application/vnd.openxmlformats-officedocument.presentationml.slideshow", "type" => "slide", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
+        "ppt" => [ "mime" => "application/vnd.ms-powerpoint", "type" => "slide", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
+        "pptm" => [ "mime" => "application/vnd.ms-powerpoint.presentation.macroEnabled.12", "type" => "slide", "conv" => true, "saveas" => ["pdf", "pptx", "odp"] ],
+        "pptx" => [ "mime" => "application/vnd.openxmlformats-officedocument.presentationml.presentation", "type" => "slide", "edit" => true, "def" => true, "comment" => true, "saveas" => ["pdf", "odp"] ],
+        "rtf" => [ "mime" => "text/rtf", "type" => "word", "conv" => true, "editable" => true, "saveas" => ["docx", "odt", "pdf", "txt"] ],
+        "txt" => [ "mime" => "text/plain", "type" => "word", "edit" => true, "editable" => true, "saveas" => ["docx", "odt", "pdf", "rtf"] ],
+        "xls" => [ "mime" => "application/vnd.ms-excel", "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
+        "xlsm" => [ "mime" => "application/vnd.ms-excel.sheet.macroEnabled.12", "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
+        "xlsx" => [ "mime" => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "type" => "cell", "edit" => true, "def" => true, "comment" => true, "modifyFilter" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
+        "xlt" => [ "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
+        "xltm" => [ "mime" => "application/vnd.ms-excel.template.macroEnabled.12", "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ],
+        "xltx" => [ "mime" => "application/vnd.openxmlformats-officedocument.spreadsheetml.template", "type" => "cell", "conv" => true, "saveas" => ["csv", "ods", "pdf", "xlsx"] ]
     ];
 
     /**

From 02942849cbe318e0099a0a8847e5137e27f3e2a9 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Mon, 27 Sep 2021 19:15:23 +0300
Subject: [PATCH 16/29] check share permissions when get users

---
 controller/editorcontroller.php | 60 ++++++++++++++++++++++++++++++---
 js/editor.js                    |  5 ++-
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 7754b4b3..001bb5a3 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -288,25 +288,75 @@ public function createNew($name, $dir, $templateId = null) {
     /**
      * Get users
      *
+     * @param $fileId - file identifier
+     *
      * @return array
      *
      * @NoAdminRequired
      * @NoCSRFRequired
      */
-    public function users() {
+    public function users($fileId) {
         $this->logger->debug("Search users", ["app" => $this->appName]);
+        $userManager = \OC::$server->getUserManager();
         $result = [];
 
         if (!$this->config->isUserAllowedToUse()) {
             return $result;
         }
 
-        $userId = $this->userSession->getUser()->getUID();
-        $users = \OC::$server->getUserManager()->search("");
+        $currentUser = $this->userSession->getUser();
+        $currentUserId = $currentUser->getUID();
+
+        list ($file, $error, $share) = $this->getFile($currentUserId, $fileId);
+        if (isset($error)) {
+            $this->logger->error("Users: $fileId $error", ["app" => $this->appName]);
+            return $result;
+        }
+
+        $canShare = (($file->getPermissions() & Constants::PERMISSION_SHARE) === Constants::PERMISSION_SHARE);
+
+        $shareMemberGroups = $this->shareManager->shareWithGroupMembersOnly();
+
+        $all = false;
+        $users = [];
+        if ($canShare) {
+            if ($shareMemberGroups) {
+                $groupManager = \OC::$server->getGroupManager();
+                $currentUserGroups = $groupManager->getUserGroupIds($currentUser);
+                foreach ($currentUserGroups as $currentUserGroup) {
+                    $group = $groupManager->get($currentUserGroup);
+                    foreach ($group->getUsers() as $user) {
+                        if (!in_array($user, $users)) {
+                            array_push($users, $user);
+                        }
+                    }
+                }
+            } else {
+                $users = $userManager->search("");
+                $all = true;
+            }
+        }
+
+        if (!$all) {
+            $accessList = [];
+            foreach ($this->shareManager->getSharesByPath($file) as $share) {
+                array_push($accessList, $share->getSharedWith());
+                $sharedBy = $share->getSharedBy();
+                if (!in_array($sharedBy, $accessList)) {
+                    array_push($accessList, $sharedBy);
+                }
+            }
+            foreach ($accessList as $accessUser) {
+                $user = $userManager->get($accessUser);
+                if (!in_array($user, $users)) {
+                    array_push($users, $userManager->get($accessUser));
+                }
+            }
+        }
+
         foreach ($users as $user) {
             $email = $user->getEMailAddress();
-            if ($user->getUID() != $userId
-                && !empty($email)) {
+            if ($user->getUID() != $currentUserId && !empty($email)) {
                 array_push($result, [
                     "email" => $email,
                     "name" => $user->getDisplayName()
diff --git a/js/editor.js b/js/editor.js
index 5c40ce2f..ea57dc31 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -455,7 +455,10 @@
     };
 
     OCA.Onlyoffice.onRequestUsers = function (event) {
-        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/users"),
+        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/users?fileId={fileId}", 
+        {
+            fileId: OCA.Onlyoffice.fileId || 0
+        }),
         function onSuccess(response) {
             OCA.Onlyoffice.docEditor.setUsers({
                 "users": response

From dd908239eeb8c6f0c7cca1b4008d74b4d6ef8dd5 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Tue, 28 Sep 2021 11:52:13 +0300
Subject: [PATCH 17/29] check share permissions when mention

---
 controller/editorcontroller.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 001bb5a3..f16d2a7a 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -391,9 +391,12 @@ public function mention($fileId, $anchor, $comment, $emails) {
             return ["error" => $this->trans->t("Failed to send notification")];
         }
 
+        $groupManager = \OC::$server->getGroupManager();
+        $userManager = \OC::$server->getUserManager();
+
         $recipientIds = [];
         foreach ($emails as $email) {
-            $recipients = \OC::$server->getUserManager()->getByEmail($email);
+            $recipients = $userManager->getByEmail($email);
             foreach ($recipients as $recipient) {
                 $recipientId = $recipient->getUID(); 
                 if (!in_array($recipientId, $recipientIds)) {
@@ -426,11 +429,21 @@ public function mention($fileId, $anchor, $comment, $emails) {
                 "anchor" => $anchor
             ]);
 
+        $shareMemberGroups = $this->shareManager->shareWithGroupMembersOnly();
         $canShare = ($file->getPermissions() & Constants::PERMISSION_SHARE) === Constants::PERMISSION_SHARE;
 
+        $currentUserGroups = [];
+        if ($shareMemberGroups) {
+            $currentUserGroups = $groupManager->getUserGroupIds($user);
+        }
+
         $accessList = [];
         foreach ($this->shareManager->getSharesByPath($file) as $share) {
             array_push($accessList, $share->getSharedWith());
+            $sharedBy = $share->getSharedBy();
+            if (!in_array($sharedBy, $accessList)) {
+                array_push($accessList, $sharedBy);
+            }
         }
 
         foreach ($recipientIds as $recipientId) {
@@ -438,6 +451,13 @@ public function mention($fileId, $anchor, $comment, $emails) {
                 if (!$canShare) {
                     continue;
                 }
+                if ($shareMemberGroups) {
+                    $recipient = $userManager->get($recipientId);
+                    $recipientGroups = $groupManager->getUserGroupIds($recipient);
+                    if (empty(array_intersect($currentUserGroups, $recipientGroups))) {
+                        continue;
+                    }
+                }
 
                 $share = $this->shareManager->newShare();
                 $share->setNode($file)

From c67465f17fbe19994ba2a3b7ebbd97bb67f3cf69 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Tue, 28 Sep 2021 11:54:47 +0300
Subject: [PATCH 18/29] privacy rules to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25702d58..de0f903d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - versions restore from editor
 
 ## Changed
+- fixed privacy rules for get users when mention
 - document server v6.0 and earlier is no longer supported
 - editing by link only for available groups
 - open share link directly

From de0bf36bb7f75d1311171dc2614763dfec4da081 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Mon, 27 Sep 2021 14:21:50 +0300
Subject: [PATCH 19/29] set favicon when open editor

---
 CHANGELOG.md   |   1 +
 img/cell.ico   | Bin 0 -> 8348 bytes
 img/slide.ico  | Bin 0 -> 8348 bytes
 img/word.ico   | Bin 0 -> 8348 bytes
 js/editor.js   |  16 ++++++++++++++++
 js/listener.js |  14 ++++++++++++++
 6 files changed, 31 insertions(+)
 create mode 100644 img/cell.ico
 create mode 100644 img/slide.ico
 create mode 100644 img/word.ico

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25702d58..82b3f3a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Change Log
 
 ## Added
+- set favicon on editor page
 - versions restore from editor
 
 ## Changed
diff --git a/img/cell.ico b/img/cell.ico
new file mode 100644
index 0000000000000000000000000000000000000000..05ecd8c040b0e8cf5c34412c400cc92ea29566b6
GIT binary patch
literal 8348
zcmeI0K@Ng25JgAh0bFYYR>otv)rHqE;K7J`3_Xg`V`!(zPk;yt*jD3jLI&DSf9EkJ
zVMGQplq3;j6IqN!<{~mS);^C!Hs*d|`pgtrnoIlZTD;$_C;9dk9kRREE6*;fJ>6$l
zueyaegT!6X4;43cJ?Hw5z4N=H_HN#(eBE3ZV^u8|8cl0bzkD8*m5Wy8T=%TnKF6wB
z)DO>}`By%Z$Wa%$iM3%}Xf&+}UD&3%F2<k>s~RpE)~9`*+vM_pTtfbTs&;%#S0VNQ
zZLJfSa)GT7G}Q^Teh}s9smmFe9n!P)@9`h>N&hzAR>WJ>SAX=wzUuon|92T6zHi$<
w_66IPf1miF*~S+6weiDT>)-MG>A6*ZHWDBK5+DH*AOR8}0TLhq68Ic}2Py&n?EnA(

literal 0
HcmV?d00001

diff --git a/img/slide.ico b/img/slide.ico
new file mode 100644
index 0000000000000000000000000000000000000000..888c7a853a451ee93e11e9643d2fca648856b62f
GIT binary patch
literal 8348
zcmeI0K?;K~5Ji7W58x486_3$vyXYwt58583w95+O+GZ3bg364f3i1OQjej!nWujz&
z1CEGexH?7>0cQY_tDE~1aCg^<YjYA@+#&6gC9iHsix2X$UiC<e7sPk|eXr`*f6p!6
z+xO4wbz_daRlMsz7413~_gbx1XX(?TrGMRj!@|^}C4chQ#DFEHELx3k(OCMlXz72S
z@!teY;FC61sMEz1IqiYdhWk(1`)1X3n>}#rTk-@hUC?9*X7dD+K*-C-qL|Ohr<gCY
z?e=T|?Jb|xe$1YK?f-e8qkTXB11{bCj?@EPV1ClKri{&h-!?Ml$!Fg9CpB~Zwf4)_
bpR8LJ5+DH*AOR8}0TLhq5+DH*2uk1w-CrZH

literal 0
HcmV?d00001

diff --git a/img/word.ico b/img/word.ico
new file mode 100644
index 0000000000000000000000000000000000000000..31f9ca4130acfe882606c0e6dc42a9e907030bb4
GIT binary patch
literal 8348
zcmeI0K?=e!5JkV@0lHRfvyvXetuDMyu^y;YkD*5qJw~0W2-zqh4M~eX5SoSzKY8;@
z=m0a!VGQJHP-egeKqk-reE}R~T*{m*!B)D?e{1cr*f*!;^IYd$%-&S_UA5b4^@yo!
zYo$21t<P~>&yhEIyLzAt++20JZX6yBoc^eHD?K#aL(KnhhEw(-^Z(!ZpR#wkcX#im
z{Qp$#OI_?z?BS!Wbpk0D^c8|%bpov)G<AOU^Va&N@qV%IT#hZ?<$kcw%l(JV|J3>0
j-f$VKe|*0`jnjBG5+DH*AOR8}0TLhq5+DH*2uI)rIKZ~m

literal 0
HcmV?d00001

diff --git a/js/editor.js b/js/editor.js
index 5c40ce2f..dbe84593 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -40,6 +40,11 @@
         OCA.Onlyoffice.template = $("#iframeEditor").data("template");
         OCA.Onlyoffice.inframe = !!$("#iframeEditor").data("inframe");
         OCA.Onlyoffice.anchor = $("#iframeEditor").attr("data-anchor");
+
+        if (OCA.Onlyoffice.inframe) {
+            OCA.Onlyoffice.faviconBase = $('link[rel="icon"]').attr("href");
+        }
+
         if (!OCA.Onlyoffice.fileId && !OCA.Onlyoffice.shareToken) {
             displayError(t(OCA.Onlyoffice.AppName, "FileId is empty"));
             return;
@@ -165,6 +170,17 @@
                     if (config.type === "mobile" && $("#app > iframe").css("position") === "fixed") {
                         $("#app > iframe").css("height", "calc(100% - 45px)");
                     }
+
+                    var favicon = OC.filePath(OCA.Onlyoffice.AppName, "img", OCA.Onlyoffice.documentType + ".ico");
+                    if (OCA.Onlyoffice.inframe) {
+                        window.parent.postMessage({
+                            method: "changeFavicon",
+                            param: favicon
+                        },
+                        "*");
+                    } else {
+                        $('link[rel="icon"]').attr("href", favicon);
+                    }
                 }
             }
         });
diff --git a/js/listener.js b/js/listener.js
index 6bd905e7..9bc2c678 100644
--- a/js/listener.js
+++ b/js/listener.js
@@ -72,6 +72,10 @@
         }
     };
 
+    OCA.Onlyoffice.changeFavicon = function (favicon) {
+        $('link[rel="icon"]').attr("href", favicon);
+    };
+
     window.addEventListener("message", function (event) {
         if ($("#onlyofficeFrame")[0].contentWindow !== event.source
             || !event.data["method"]) {
@@ -106,6 +110,9 @@
             case "onDocumentReady":
                 OCA.Onlyoffice.onDocumentReady(event.data.param);
                 break;
+            case "changeFavicon":
+                OCA.Onlyoffice.changeFavicon(event.data.param);
+                break;
         }
     }, false);
 
@@ -115,4 +122,11 @@
         }
     });
 
+    window.addEventListener("DOMNodeRemoved", function(event) {
+        if ($(event.target).length && $("#onlyofficeFrame").length
+            && ($(event.target)[0].id === "viewer" || $(event.target)[0].id === $("#onlyofficeFrame")[0].id)) {
+            OCA.Onlyoffice.changeFavicon($("#onlyofficeFrame")[0].contentWindow.OCA.Onlyoffice.faviconBase);
+        }
+    });
+
 })(OCA);

From 1622a8f5a14f63c719be35ad480d7829cf63f038 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Wed, 29 Sep 2021 11:37:20 +0300
Subject: [PATCH 20/29] check access for group share

---
 controller/editorcontroller.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index f16d2a7a..8981e569 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -298,6 +298,7 @@ public function createNew($name, $dir, $templateId = null) {
     public function users($fileId) {
         $this->logger->debug("Search users", ["app" => $this->appName]);
         $userManager = \OC::$server->getUserManager();
+        $groupManager = \OC::$server->getGroupManager();
         $result = [];
 
         if (!$this->config->isUserAllowedToUse()) {
@@ -321,7 +322,6 @@ public function users($fileId) {
         $users = [];
         if ($canShare) {
             if ($shareMemberGroups) {
-                $groupManager = \OC::$server->getGroupManager();
                 $currentUserGroups = $groupManager->getUserGroupIds($currentUser);
                 foreach ($currentUserGroups as $currentUserGroup) {
                     $group = $groupManager->get($currentUserGroup);
@@ -338,18 +338,22 @@ public function users($fileId) {
         }
 
         if (!$all) {
-            $accessList = [];
             foreach ($this->shareManager->getSharesByPath($file) as $share) {
-                array_push($accessList, $share->getSharedWith());
-                $sharedBy = $share->getSharedBy();
-                if (!in_array($sharedBy, $accessList)) {
-                    array_push($accessList, $sharedBy);
+                $accessList = [];
+                $shareWith = $share->getSharedWith();
+                if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
+                    $group = $groupManager->get($shareWith);
+                    $accessList = $group->getUsers();
+                } else if ($share->getShareType() === Share::SHARE_TYPE_USER) {
+                    array_push($accessList, $userManager->get($shareWith));
                 }
-            }
-            foreach ($accessList as $accessUser) {
-                $user = $userManager->get($accessUser);
-                if (!in_array($user, $users)) {
-                    array_push($users, $userManager->get($accessUser));
+                $shareBy = $share->getSharedBy();
+                array_push($accessList, $userManager->get($shareBy));
+
+                foreach ($accessList as $accessUser) {
+                    if (!in_array($accessUser, $users)) {
+                        array_push($users, $accessUser);
+                    }
                 }
             }
         }

From 6badb5685b60adce58195f0b9edcee7593e32f09 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Wed, 29 Sep 2021 12:09:49 +0300
Subject: [PATCH 21/29] userManager, groupManager to editorController
 constructor

---
 appinfo/application.php         |  4 ++-
 controller/editorcontroller.php | 51 ++++++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/appinfo/application.php b/appinfo/application.php
index 911484d5..fa04730f 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -171,13 +171,15 @@ function () {
                 $c->query("Request"),
                 $c->query("RootStorage"),
                 $c->query("UserSession"),
+                $c->query("ServerContainer")->getUserManager(),
                 $c->query("URLGenerator"),
                 $c->query("L10N"),
                 $c->query("Logger"),
                 $this->appConfig,
                 $this->crypt,
                 $c->query("IManager"),
-                $c->query("Session")
+                $c->query("Session"),
+                $c->query("ServerContainer")->getGroupManager()
             );
         });
 
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 8981e569..e49e2286 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -36,6 +36,8 @@
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\IUserManager;
+use OCP\IGroupManager;
 use OCP\Share\IManager;
 use OCP\Share;
 
@@ -61,6 +63,13 @@ class EditorController extends Controller {
      */
     private $userSession;
 
+    /**
+     * Current user manager
+     *
+     * @var IUserManager
+     */
+    private $userManager;
+
     /**
      * Root folder
      *
@@ -124,6 +133,13 @@ class EditorController extends Controller {
      */
     private $shareManager;
 
+    /**
+     * Group manager
+     *
+     * @var IGroupManager
+     */
+    private $groupManager;
+
     /**
      * Mobile regex from https://github.com/ONLYOFFICE/CommunityServer/blob/v9.1.1/web/studio/ASC.Web.Studio/web.appsettings.config#L35
      */
@@ -134,29 +150,34 @@ class EditorController extends Controller {
      * @param IRequest $request - request object
      * @param IRootFolder $root - root folder
      * @param IUserSession $userSession - current user session
+     * @param IUserManager $userManager - current user manager
      * @param IURLGenerator $urlGenerator - url generator service
      * @param IL10N $trans - l10n service
      * @param ILogger $logger - logger
      * @param AppConfig $config - application configuration
      * @param Crypt $crypt - hash generator
      * @param IManager $shareManager - Share manager
-     * @param ISession $ISession - Session
+     * @param ISession $session - Session
+     * @param IGroupManager $groupManager - Group manager
      */
     public function __construct($AppName,
                                     IRequest $request,
                                     IRootFolder $root,
                                     IUserSession $userSession,
+                                    IUserManager $userManager,
                                     IURLGenerator $urlGenerator,
                                     IL10N $trans,
                                     ILogger $logger,
                                     AppConfig $config,
                                     Crypt $crypt,
                                     IManager $shareManager,
-                                    ISession $session
+                                    ISession $session,
+                                    IGroupManager $groupManager
                                     ) {
         parent::__construct($AppName, $request);
 
         $this->userSession = $userSession;
+        $this->userManager = $userManager;
         $this->root = $root;
         $this->urlGenerator = $urlGenerator;
         $this->trans = $trans;
@@ -164,6 +185,7 @@ public function __construct($AppName,
         $this->config = $config;
         $this->crypt = $crypt;
         $this->shareManager = $shareManager;
+        $this->groupManager = $groupManager;
 
         $this->versionManager = new VersionManager($AppName, $root);
 
@@ -297,8 +319,6 @@ public function createNew($name, $dir, $templateId = null) {
      */
     public function users($fileId) {
         $this->logger->debug("Search users", ["app" => $this->appName]);
-        $userManager = \OC::$server->getUserManager();
-        $groupManager = \OC::$server->getGroupManager();
         $result = [];
 
         if (!$this->config->isUserAllowedToUse()) {
@@ -322,9 +342,9 @@ public function users($fileId) {
         $users = [];
         if ($canShare) {
             if ($shareMemberGroups) {
-                $currentUserGroups = $groupManager->getUserGroupIds($currentUser);
+                $currentUserGroups = $this->groupManager->getUserGroupIds($currentUser);
                 foreach ($currentUserGroups as $currentUserGroup) {
-                    $group = $groupManager->get($currentUserGroup);
+                    $group = $this->groupManager->get($currentUserGroup);
                     foreach ($group->getUsers() as $user) {
                         if (!in_array($user, $users)) {
                             array_push($users, $user);
@@ -332,7 +352,7 @@ public function users($fileId) {
                     }
                 }
             } else {
-                $users = $userManager->search("");
+                $users = $this->userManager->search("");
                 $all = true;
             }
         }
@@ -342,13 +362,13 @@ public function users($fileId) {
                 $accessList = [];
                 $shareWith = $share->getSharedWith();
                 if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
-                    $group = $groupManager->get($shareWith);
+                    $group = $this->groupManager->get($shareWith);
                     $accessList = $group->getUsers();
                 } else if ($share->getShareType() === Share::SHARE_TYPE_USER) {
-                    array_push($accessList, $userManager->get($shareWith));
+                    array_push($accessList, $this->userManager->get($shareWith));
                 }
                 $shareBy = $share->getSharedBy();
-                array_push($accessList, $userManager->get($shareBy));
+                array_push($accessList, $this->userManager->get($shareBy));
 
                 foreach ($accessList as $accessUser) {
                     if (!in_array($accessUser, $users)) {
@@ -395,12 +415,9 @@ public function mention($fileId, $anchor, $comment, $emails) {
             return ["error" => $this->trans->t("Failed to send notification")];
         }
 
-        $groupManager = \OC::$server->getGroupManager();
-        $userManager = \OC::$server->getUserManager();
-
         $recipientIds = [];
         foreach ($emails as $email) {
-            $recipients = $userManager->getByEmail($email);
+            $recipients = $this->userManager->getByEmail($email);
             foreach ($recipients as $recipient) {
                 $recipientId = $recipient->getUID(); 
                 if (!in_array($recipientId, $recipientIds)) {
@@ -438,7 +455,7 @@ public function mention($fileId, $anchor, $comment, $emails) {
 
         $currentUserGroups = [];
         if ($shareMemberGroups) {
-            $currentUserGroups = $groupManager->getUserGroupIds($user);
+            $currentUserGroups = $this->groupManager->getUserGroupIds($user);
         }
 
         $accessList = [];
@@ -456,8 +473,8 @@ public function mention($fileId, $anchor, $comment, $emails) {
                     continue;
                 }
                 if ($shareMemberGroups) {
-                    $recipient = $userManager->get($recipientId);
-                    $recipientGroups = $groupManager->getUserGroupIds($recipient);
+                    $recipient = $this->userManager->get($recipientId);
+                    $recipientGroups = $this->groupManager->getUserGroupIds($recipient);
                     if (empty(array_intersect($currentUserGroups, $recipientGroups))) {
                         continue;
                     }

From fd894a29d78cdb357539a64d1bd2504cf55c93aa Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Fri, 1 Oct 2021 15:10:57 +0300
Subject: [PATCH 22/29] format accessList

---
 controller/editorcontroller.php | 67 ++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index e49e2286..13465e5c 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -358,22 +358,10 @@ public function users($fileId) {
         }
 
         if (!$all) {
-            foreach ($this->shareManager->getSharesByPath($file) as $share) {
-                $accessList = [];
-                $shareWith = $share->getSharedWith();
-                if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
-                    $group = $this->groupManager->get($shareWith);
-                    $accessList = $group->getUsers();
-                } else if ($share->getShareType() === Share::SHARE_TYPE_USER) {
-                    array_push($accessList, $this->userManager->get($shareWith));
-                }
-                $shareBy = $share->getSharedBy();
-                array_push($accessList, $this->userManager->get($shareBy));
-
-                foreach ($accessList as $accessUser) {
-                    if (!in_array($accessUser, $users)) {
-                        array_push($users, $accessUser);
-                    }
+            $accessList = $this->getAccessList($file);
+            foreach ($accessList as $accessUser) {
+                if (!in_array($accessUser, $users)) {
+                    array_push($users, $accessUser);
                 }
             }
         }
@@ -458,22 +446,15 @@ public function mention($fileId, $anchor, $comment, $emails) {
             $currentUserGroups = $this->groupManager->getUserGroupIds($user);
         }
 
-        $accessList = [];
-        foreach ($this->shareManager->getSharesByPath($file) as $share) {
-            array_push($accessList, $share->getSharedWith());
-            $sharedBy = $share->getSharedBy();
-            if (!in_array($sharedBy, $accessList)) {
-                array_push($accessList, $sharedBy);
-            }
-        }
+        $accessList = $this->getAccessList($file);
 
         foreach ($recipientIds as $recipientId) {
-            if (!in_array($recipientId, $accessList)) {
+            $recipient = $this->userManager->get($recipientId);
+            if (!in_array($recipient, $accessList)) {
                 if (!$canShare) {
                     continue;
                 }
                 if ($shareMemberGroups) {
-                    $recipient = $this->userManager->get($recipientId);
                     $recipientGroups = $this->groupManager->getUserGroupIds($recipient);
                     if (empty(array_intersect($currentUserGroups, $recipientGroups))) {
                         continue;
@@ -1286,6 +1267,40 @@ private function buildUserId($userId) {
         return $userId;
     }
 
+    /**
+     * Return list users who has access to file
+     *
+     * @param File $file - file
+     *
+     * @return array
+     */
+    private function getAccessList($file) {
+        $result = [];
+
+        foreach ($this->shareManager->getSharesByPath($file) as $share) {
+            $accessList = [];
+            $shareWith = $share->getSharedWith();
+            if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
+                $group = $this->groupManager->get($shareWith);
+                $accessList = $group->getUsers();
+            } else if ($share->getShareType() === Share::SHARE_TYPE_USER) {
+                array_push($accessList, $this->userManager->get($shareWith));
+            }
+
+            foreach ($accessList as $accessUser) {
+                if (!in_array($accessUser, $result)) {
+                    array_push($result, $accessUser);
+                }
+            }
+        }
+
+        if (!in_array($file->getOwner(), $result)) {
+            array_push($result, $file->getOwner());
+        }
+
+        return $result;
+    }
+
     /**
      * Print error page
      *

From bcf8d1086a1be73cc3f186aa60835957d2f9f26f Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Mon, 4 Oct 2021 12:18:25 +0300
Subject: [PATCH 23/29] iPad as mobile device

---
 js/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/main.js b/js/main.js
index 681aa6b7..5a0f1ca2 100644
--- a/js/main.js
+++ b/js/main.js
@@ -25,7 +25,8 @@
         }, OCA.Onlyoffice);
 
     OCA.Onlyoffice.setting = {};
-    OCA.Onlyoffice.mobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phone|Kindle|Silk|Opera Mini/i.test(navigator.userAgent);
+    OCA.Onlyoffice.mobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phone|Kindle|Silk|Opera Mini|Macintosh/i.test(navigator.userAgent)
+                            && navigator.maxTouchPoints && navigator.maxTouchPoints > 1;
 
     OCA.Onlyoffice.CreateFile = function (name, fileList, templateId) {
         var dir = fileList.getCurrentDirectory();

From 316ca17f98dbb8aa2e65bd6b20c7144ba7c6b907 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 12 Oct 2021 09:38:38 +0300
Subject: [PATCH 24/29] Make GetGlobalTemplates faster when template dir is
 empty

---
 lib/templatemanager.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/templatemanager.php b/lib/templatemanager.php
index 11b8eb2f..365d4263 100644
--- a/lib/templatemanager.php
+++ b/lib/templatemanager.php
@@ -72,10 +72,10 @@ public static function GetGlobalTemplateDir() {
     public static function GetGlobalTemplates($mimetype = null) {
         $templateDir = self::GetGlobalTemplateDir();
 
-        if (!empty($mimetype)) {
+        $templatesList = $templateDir->getDirectoryListing();
+        if (!empty($mimetype)
+            && is_array($templatesList) && count($templatesList) > 0) {
             $templatesList = $templateDir->searchByMime($mimetype);
-        } else {
-            $templatesList = $templateDir->getDirectoryListing();
         }
 
         return $templatesList;

From 6f1d21abeda631cda7a94924b65843c139c8f101 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Wed, 13 Oct 2021 18:40:30 +0300
Subject: [PATCH 25/29] don't close editor if url by onlyoffice editor

---
 js/listener.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/listener.js b/js/listener.js
index 9bc2c678..7b9127cb 100644
--- a/js/listener.js
+++ b/js/listener.js
@@ -117,7 +117,8 @@
     }, false);
 
     window.addEventListener("popstate", function (event) {
-        if ($("#onlyofficeFrame").length) {
+        if ($("#onlyofficeFrame").length
+            && location.href.indexOf(OCA.Onlyoffice.AppName) == -1) {
             OCA.Onlyoffice.onRequestClose();
         }
     });

From dfc7fc562afb7b945d53fa27509669e0de114f91 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Tue, 26 Oct 2021 19:15:37 +0300
Subject: [PATCH 26/29] format display message when inframe

---
 js/editor.js   | 41 ++++++++++++++++++++++++++---------------
 js/listener.js |  6 ++++++
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/js/editor.js b/js/editor.js
index fe42c73e..56e69302 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -27,11 +27,6 @@
         }, OCA.Onlyoffice);
 
     OCA.Onlyoffice.InitEditor = function () {
-        var displayError = function (error) {
-            OC.Notification.show(error, {
-                type: "error"
-            });
-        };
 
         OCA.Onlyoffice.fileId = $("#iframeEditor").data("id");
         var filePath = $("#iframeEditor").data("path");
@@ -46,12 +41,12 @@
         }
 
         if (!OCA.Onlyoffice.fileId && !OCA.Onlyoffice.shareToken) {
-            displayError(t(OCA.Onlyoffice.AppName, "FileId is empty"));
+            OCA.Onlyoffice.showMessage(t(OCA.Onlyoffice.AppName, "FileId is empty"), {type: "error"});
             return;
         }
 
         if (typeof DocsAPI === "undefined") {
-            displayError(t(OCA.Onlyoffice.AppName, "ONLYOFFICE cannot be reached. Please contact admin"));
+            OCA.Onlyoffice.showMessage(t(OCA.Onlyoffice.AppName, "ONLYOFFICE cannot be reached. Please contact admin"), {type: "error"});
             return;
         }
 
@@ -91,7 +86,7 @@
             success: function onSuccess(config) {
                 if (config) {
                     if (config.error != null) {
-                        displayError(config.error);
+                        OCA.Onlyoffice.showMessage(config.error, {type: "error"});
                         return;
                     }
 
@@ -288,14 +283,14 @@
             saveData,
             function onSuccess(response) {
                 if (response.error) {
-                    OC.Notification.show(response.error, {
+                    OCA.Onlyoffice.showMessage(response.error, {
                         type: "error",
                         timeout: 3
                     });
                     return;
                 }
 
-                OC.Notification.show(t(OCA.Onlyoffice.AppName, "File saved") + " (" + response.name + ")", {
+                OCA.Onlyoffice.showMessage(t(OCA.Onlyoffice.AppName, "File saved") + " (" + response.name + ")", {
                     timeout: 3
                 });
             });
@@ -335,7 +330,7 @@
             }),
             function onSuccess(response) {
                 if (response.error) {
-                    OC.Notification.show(response.error, {
+                    OCA.Onlyoffice.showMessage(response.error, {
                         type: "error",
                         timeout: 3
                     });
@@ -377,7 +372,7 @@
             }),
             function onSuccess(response) {
                 if (response.error) {
-                    OC.Notification.show(response.error, {
+                    OCA.Onlyoffice.showMessage(response.error, {
                         type: "error",
                         timeout: 3
                     });
@@ -431,7 +426,7 @@
             }),
             function onSuccess(response) {
                 if (response.error) {
-                    OC.Notification.show(response.error, {
+                    OCA.Onlyoffice.showMessage(response.error, {
                         type: "error",
                         timeout: 3
                     });
@@ -498,14 +493,14 @@
             },
             function onSuccess(response) {
                 if (response.error) {
-                    OC.Notification.show(response.error, {
+                    OCA.Onlyoffice.showMessage(response.error, {
                         type: "error",
                         timeout: 3
                     });
                     return;
                 }
 
-                OC.Notification.show(response.message, {
+                OCA.Onlyoffice.showMessage(response.message, {
                     timeout: 3
                 });
             });
@@ -528,6 +523,22 @@
         }
     }
 
+    OCA.Onlyoffice.showMessage = function (message, props = null) {
+        if (OCA.Onlyoffice.inframe) {
+            window.parent.postMessage({
+                method: "onShowMessage",
+                param: {
+                    message: message,
+                    props: props
+                }
+            },
+            "*");
+            return;
+        }
+
+        OC.Notification.show(message, props);
+    };
+
     OCA.Onlyoffice.refreshHistory = function (response, version) {
         if (response.error) {
             var data = {error: response.error};
diff --git a/js/listener.js b/js/listener.js
index 9bc2c678..45da6f4c 100644
--- a/js/listener.js
+++ b/js/listener.js
@@ -76,6 +76,10 @@
         $('link[rel="icon"]').attr("href", favicon);
     };
 
+    OCA.Onlyoffice.onShowMessage = function (messageObj) {
+        OC.Notification.show(messageObj.message, messageObj.props);
+    }
+
     window.addEventListener("message", function (event) {
         if ($("#onlyofficeFrame")[0].contentWindow !== event.source
             || !event.data["method"]) {
@@ -113,6 +117,8 @@
             case "changeFavicon":
                 OCA.Onlyoffice.changeFavicon(event.data.param);
                 break;
+            case "onShowMessage":
+                OCA.Onlyoffice.onShowMessage(event.data.param);
         }
     }, false);
 

From b5f2276a4281e59039dbddbc44bf1134ec5b0aa0 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Fri, 29 Oct 2021 17:58:16 +0300
Subject: [PATCH 27/29] versions history don't for external link

---
 controller/editorcontroller.php |  2 --
 js/editor.js                    | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 13465e5c..3ce41b94 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -657,7 +657,6 @@ public function save($name, $dir, $url) {
      * @return array
      *
      * @NoAdminRequired
-     * @PublicPage
      */
     public function history($fileId, $shareToken = null) {
         $this->logger->debug("Request history for: $fileId", ["app" => $this->appName]);
@@ -778,7 +777,6 @@ public function history($fileId, $shareToken = null) {
      * @return array
      *
      * @NoAdminRequired
-     * @PublicPage
      */
     public function version($fileId, $version, $shareToken = null) {
         $this->logger->debug("Request version for: $fileId ($version)", ["app" => $this->appName]);
diff --git a/js/editor.js b/js/editor.js
index 56e69302..8b310f80 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -119,16 +119,6 @@
                         "onMakeActionLink": OCA.Onlyoffice.onMakeActionLink,
                     };
 
-                    if (!OCA.Onlyoffice.template) {
-                        config.events.onRequestHistory = OCA.Onlyoffice.onRequestHistory;
-                        config.events.onRequestHistoryData = OCA.Onlyoffice.onRequestHistoryData;
-                        config.events.onRequestRestore = OCA.Onlyoffice.onRequestRestore;
-
-                        if (!OCA.Onlyoffice.version) {
-                            config.events.onRequestHistoryClose = OCA.Onlyoffice.onRequestHistoryClose;
-                        }
-                    }
-
                     if (config.editorConfig.tenant) {
                         config.events.onAppReady = function () {
                             OCA.Onlyoffice.docEditor.showMessage(t(OCA.Onlyoffice.AppName, "You are using public demo ONLYOFFICE Docs server. Please do not store private sensitive data."));
@@ -148,6 +138,16 @@
                         if (!OCA.Onlyoffice.filePath) {
                             OCA.Onlyoffice.filePath = config._file_path;
                         }
+
+                        if (!OCA.Onlyoffice.template) {
+                            config.events.onRequestHistory = OCA.Onlyoffice.onRequestHistory;
+                            config.events.onRequestHistoryData = OCA.Onlyoffice.onRequestHistoryData;
+                            config.events.onRequestRestore = OCA.Onlyoffice.onRequestRestore;
+
+                            if (!OCA.Onlyoffice.version) {
+                                config.events.onRequestHistoryClose = OCA.Onlyoffice.onRequestHistoryClose;
+                            }
+                        }
                     }
 
                     if (OCA.Onlyoffice.inframe) {

From 7e4cd6b10e411168e7c95d58ae15f541771f2ae3 Mon Sep 17 00:00:00 2001
From: Antipkin-A <Artem.Antipkin@onlyoffice.com>
Date: Fri, 29 Oct 2021 19:18:38 +0300
Subject: [PATCH 28/29] don't get all users if has limit on autocomplete

---
 controller/editorcontroller.php | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 13465e5c..43390ae6 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -325,6 +325,15 @@ public function users($fileId) {
             return $result;
         }
 
+        if (!$this->allowEnumeration()) {
+            return $result;
+        }
+
+        $autocompleteMemberGroup = false;
+        if ($this->limitEnumerationToGroups()) {
+            $autocompleteMemberGroup = true;
+        }
+
         $currentUser = $this->userSession->getUser();
         $currentUserId = $currentUser->getUID();
 
@@ -341,7 +350,7 @@ public function users($fileId) {
         $all = false;
         $users = [];
         if ($canShare) {
-            if ($shareMemberGroups) {
+            if ($shareMemberGroups || $autocompleteMemberGroup) {
                 $currentUserGroups = $this->groupManager->getUserGroupIds($currentUser);
                 foreach ($currentUserGroups as $currentUserGroup) {
                     $group = $this->groupManager->get($currentUserGroup);
@@ -1301,6 +1310,28 @@ private function getAccessList($file) {
         return $result;
     }
 
+    /**
+     * Return allow autocomplete usernames
+     *
+     * @return bool
+     */
+    private function allowEnumeration() {
+        return \OC::$server->getConfig()->getAppValue("core", "shareapi_allow_share_dialog_user_enumeration", "yes") === "yes";
+    }
+
+    /**
+     * Return allow autocomplete usernames group member only
+     *
+     * @return bool
+     */
+    private function limitEnumerationToGroups() {
+        if ($this->allowEnumeration()) {
+            return \OC::$server->getConfig()->getAppValue("core", "shareapi_share_dialog_user_enumeration_group_members", "no") === "yes";
+        }
+
+        return false;
+    }
+
     /**
      * Print error page
      *

From 82edc4118ef6898769d13fe4679e0a8fb0c54294 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 2 Nov 2021 16:07:22 +0300
Subject: [PATCH 29/29] 7.2.1

---
 CHANGELOG.md     | 1 +
 appinfo/info.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fe46d95..e7d9085e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Change Log
 
+## 7.2.1
 ## Added
 - set favicon on editor page
 - versions restore from editor
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 00dd5dcd..1294b89b 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within ownCloud 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>apl2</licence>
     <author>Ascensio System SIA</author>
-    <version>7.1.1</version>
+    <version>7.2.1</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>