From de7ccaddd5245454e8c7e0fbd23dcc335f2c7ac6 Mon Sep 17 00:00:00 2001 From: svetlana maleeva Date: Thu, 3 Dec 2020 13:58:37 +0300 Subject: [PATCH 1/4] Updated pro features article (added the sheet view feature) --- .../Common/ProFeatures/ProFeatures.ascx | 14 ++++++++++++-- .../Help/Guides/big/guide125/compare.png | Bin 80862 -> 112199 bytes .../Help/Guides/big/guide125/controls.png | Bin 81710 -> 114097 bytes .../Help/Guides/big/guide125/sheetview.png | Bin 0 -> 153084 bytes .../Help/Guides/small/guide125/compare.png | Bin 46875 -> 46800 bytes .../Help/Guides/small/guide125/controls.png | Bin 47455 -> 48230 bytes .../Help/Guides/small/guide125/sheetview.png | Bin 0 -> 101182 bytes 7 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 Web/images/Help/Guides/big/guide125/sheetview.png create mode 100644 Web/images/Help/Guides/small/guide125/sheetview.png diff --git a/Web/Controls/Help/Desktop/Documents/Common/ProFeatures/ProFeatures.ascx b/Web/Controls/Help/Desktop/Documents/Common/ProFeatures/ProFeatures.ascx index f904abfba..0b7c2763b 100644 --- a/Web/Controls/Help/Desktop/Documents/Common/ProFeatures/ProFeatures.ascx +++ b/Web/Controls/Help/Desktop/Documents/Common/ProFeatures/ProFeatures.ascx @@ -39,10 +39,14 @@

Starting from the version 5.6 of Desktop Editors, you can add pro features to Desktop Editors and use them when working with local documents. Pro features are the features which are available in the paid online version (cloud or server), starting from Document Server v.5.5.

-

Currently, pro features are only available for the Document Editor:

+

Currently, the following pro features are available for the Document Editor:

+

The following pro feature is available for the Spreadsheet Editor:

+ @@ -109,7 +113,13 @@ Compare documents" />
- +

To manage sheet view presets, switch to the View tab and use the Sheet View icon" /> Sheet View button on the top toolbar.

+

The detailed instructions on how to work with sheet view presets are available ">here.

+
+ Sheet View" /> + Sheet View" /> +
+
diff --git a/Web/images/Help/Guides/big/guide125/compare.png b/Web/images/Help/Guides/big/guide125/compare.png index ff36d4e8c372c43411a5aca3fb8a954903cbacf9..ed5543640828524a00a5fc0e0837913afb262a6e 100644 GIT binary patch literal 112199 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 ---%> +

Версия 6.0.2

Дата выпуска: 19.11.2020

diff --git a/Web/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditors_Current.ascx b/Web/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditors_Current.ascx index 43a13e45b..d4b67072c 100644 --- a/Web/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditors_Current.ascx +++ b/Web/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditors_Current.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" Inherits="BaseContentUserControls" %> <%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> -v.6.0 +v.6.1 \ No newline at end of file From b48c3f8f8af7f3820f4ea27728fae360bfc735e6 Mon Sep 17 00:00:00 2001 From: svetlana maleeva Date: Thu, 3 Dec 2020 16:44:03 +0300 Subject: [PATCH 4/4] Updated introduction in the 'Connecting Desktop Editors to SaaS, server, Personal' articles --- .../Documents/Common/ConnectPersonal/ConnectPersonal.ascx | 2 +- .../Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ascx | 4 ++-- .../Documents/Common/ConnectSaaS/ConnectSaaS.ru.ascx | 4 ++-- .../Common/ConnectServerVersion/ConnectServerVersion.ascx | 6 +++--- .../ConnectServerVersion/ConnectServerVersion.ru.ascx | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Web/Controls/Help/Desktop/Documents/Common/ConnectPersonal/ConnectPersonal.ascx b/Web/Controls/Help/Desktop/Documents/Common/ConnectPersonal/ConnectPersonal.ascx index 2edfb9ed2..75d82574b 100644 --- a/Web/Controls/Help/Desktop/Documents/Common/ConnectPersonal/ConnectPersonal.ascx +++ b/Web/Controls/Help/Desktop/Documents/Common/ConnectPersonal/ConnectPersonal.ascx @@ -26,7 +26,7 @@

After you have installed ONLYOFFICE Desktop Editors on your computer, you can easily connect the application to your existing Personal cloud so that you can use all the product capabilities:

An Internet connection is required for connecting a Personal cloud, as well as for real-time co-editing and using online features. diff --git a/Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ascx b/Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ascx index 41e1a57a4..d3767efdc 100644 --- a/Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ascx +++ b/Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ascx @@ -30,8 +30,8 @@

After you have installed ONLYOFFICE Desktop Editors on your computer, you can easily connect the application to your existing SaaS portal or create a new one so that you can use all the product capabilities:

An Internet connection is required for creating or connecting a portal, as well as for real-time co-editing, enabling pro features and using online features. diff --git a/Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ru.ascx b/Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ru.ascx index 988540b41..beef99c07 100644 --- a/Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ru.ascx +++ b/Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ru.ascx @@ -30,8 +30,8 @@

После установки десктопных редакторов ONLYOFFICE на компьютер их можно легко подключить к существующему SaaS-порталу или создать новый портал, чтобы использовать все возможности продукта:

Для создания или подключения портала, а также для совместного редактирования в режиме реального времени, включения профессиональных функций и использования онлайн-функций требуется соединение с Интернетом. diff --git a/Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ascx b/Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ascx index dfbf4d6fd..035232e47 100644 --- a/Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ascx +++ b/Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ascx @@ -30,9 +30,9 @@

After you have installed ONLYOFFICE Desktop Editors on your computer, you can easily connect the application to your ONLYOFFICE Workspace Enterprise Edition server so that you can use all the product capabilities:

If you are using your ONLYOFFICE Workspace Enterprise Edition on a local network, and the users are accessing your server using the local network only, an Internet connection is not required. If you are using the ONLYOFFICE Workspace Enterprise Edition over the Internet, an Internet connection is required for connecting to your server, as well as for real-time co-editing, enabling pro features, using Private rooms and online features. diff --git a/Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ru.ascx b/Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ru.ascx index 518bc7271..96d689442 100644 --- a/Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ru.ascx +++ b/Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ru.ascx @@ -30,9 +30,9 @@

После установки десктопных редакторов ONLYOFFICE на компьютер их можно легко подключить к серверу ONLYOFFICE Workspace Enterprise Edition, чтобы использовать все возможности продукта:

Если вы используете ONLYOFFICE Workspace Enterprise Edition в локальной сети, и пользователи получают доступ к серверу только по локальной сети, подключение к Интернету не требуется. Если вы получаете доступ к ONLYOFFICE Workspace Enterprise Edition через Интернет, соединение с Интернетом потребуется для подключения к серверу, а также для совместного редактирования в режиме реального времени, включения профессиональных функций, использования Приватных комнат и онлайн-функций.