From a58b4503dd94de7bfa4286319fb92a7cb62423b3 Mon Sep 17 00:00:00 2001
From: maxkadushkin
Date: Thu, 25 Jan 2024 16:07:07 +0300
Subject: [PATCH 01/17] [rtl] changed font name
---
apps/common/main/resources/less/variables.less | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less
index bc7d1e824c..28d4278e9e 100644
--- a/apps/common/main/resources/less/variables.less
+++ b/apps/common/main/resources/less/variables.less
@@ -56,6 +56,10 @@
// Typography
// -------------------------
+.rtl {
+ --font-family-base-custom: "Segoe UI", "Traditional Arabic";
+}
+
@font-family-sans-serif: Arial, Helvetica, "Helvetica Neue", sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
From 281f4a5afe893e6f1ff3a6bc124f224a681249fc Mon Sep 17 00:00:00 2001
From: maxkadushkin
Date: Mon, 29 Jan 2024 20:10:22 +0300
Subject: [PATCH 02/17] [rtl] added font-family for macos
---
apps/common/main/resources/less/variables.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less
index 28d4278e9e..036883041b 100644
--- a/apps/common/main/resources/less/variables.less
+++ b/apps/common/main/resources/less/variables.less
@@ -57,7 +57,7 @@
// -------------------------
.rtl {
- --font-family-base-custom: "Segoe UI", "Traditional Arabic";
+ --font-family-base-custom: system-ui, -apple-system, "Geeza Pro", "Segoe UI", "Traditional Arabic", "Noto Sans";
}
@font-family-sans-serif: Arial, Helvetica, "Helvetica Neue", sans-serif;
From 5db0b84cbd6f0ef2bd4d0e0ea81b7ae027b5cf1e Mon Sep 17 00:00:00 2001
From: SergeyEzhin
Date: Tue, 30 Jan 2024 10:49:55 +0100
Subject: [PATCH 03/17] [DE mobile] Fix Bug 66209
---
apps/documenteditor/mobile/locale/en.json | 4 ++--
apps/documenteditor/mobile/src/controller/Main.jsx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json
index 7d42af50fd..9dc85dcd77 100644
--- a/apps/documenteditor/mobile/locale/en.json
+++ b/apps/documenteditor/mobile/locale/en.json
@@ -517,8 +517,8 @@
"errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
"leavePageText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",
"notcriticalErrorTitle": "Warning",
- "del_textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
- "textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
+ "textConvertForm": "Download file as pdf to save the form in the format ready for filling.",
+ "del_textConvertFormSave": "Save file as a fillable PDF form to be able to fill it out.",
"textCancel": "Cancel",
"textSaveAsPdf": "Save as PDF",
"textDownloadPdf": "Download PDF",
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index 966926e295..de139b16c1 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -308,12 +308,12 @@ class MainController extends Component {
if(isOForm) {
f7.dialog.create({
title: t('Main.notcriticalErrorTitle'),
- text: t('Main.textConvertFormSave'),
+ text: t('Main.textConvertForm'),
buttons: [
{
- text: appOptions.canRequestSaveAs || !!appOptions.saveAsUrl || appOptions.isOffline ? t('Main.textSaveAsPdf') : t('Main.textDownloadPdf'),
+ text: t('Main.textDownloadPdf'),
onClick: () => {
- this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF, appOptions.canRequestSaveAs || !!appOptions.saveAsUrl));
+ this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF, false))
}
},
{
From d0e8a3ecb5afde85478f7807e0db7ff500e589d2 Mon Sep 17 00:00:00 2001
From: SergeyEzhin
Date: Tue, 30 Jan 2024 11:07:21 +0100
Subject: [PATCH 04/17] [SSE mobile] Fix Bug 57730
---
apps/common/mobile/resources/less/colors-table.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/common/mobile/resources/less/colors-table.less b/apps/common/mobile/resources/less/colors-table.less
index f10baad50f..8228c10322 100644
--- a/apps/common/mobile/resources/less/colors-table.less
+++ b/apps/common/mobile/resources/less/colors-table.less
@@ -39,7 +39,7 @@
// Canvas
--canvas-background: #eee;
- --canvas-content-background: #232323;
+ --canvas-content-background: #fff;
--canvas-page-border: #ccc;
--canvas-ruler-background: #fff;
From 963fa3d80040fff0e00d2956b9d98c09be8e375f Mon Sep 17 00:00:00 2001
From: SergeyEzhin
Date: Wed, 31 Jan 2024 13:01:06 +0100
Subject: [PATCH 05/17] [DE mobile] Fix Bug 66275
---
apps/documenteditor/mobile/src/store/appOptions.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/documenteditor/mobile/src/store/appOptions.js b/apps/documenteditor/mobile/src/store/appOptions.js
index e10102ada9..f4a4323eaf 100644
--- a/apps/documenteditor/mobile/src/store/appOptions.js
+++ b/apps/documenteditor/mobile/src/store/appOptions.js
@@ -198,8 +198,8 @@ export class storeAppOptions {
this.canBranding = params.asc_getCustomization();
this.canBrandingExt = params.asc_getCanBranding() && (typeof this.customization == 'object');
- this.canFavorite = document.info && (document.info.favorite !== undefined && document.info.favorite !== null) && !this.isOffline;
- this.isFavorite = document.info.favorite;
+ this.canFavorite = document.info && (document.info?.favorite !== undefined && document.info?.favorite !== null) && !this.isOffline;
+ this.isFavorite = document.info?.favorite;
if ( this.isLightVersion ) {
this.canUseHistory = this.canReview = this.isReviewOnly = false;
From 263c96dee8429956daf73d5e2bb47d339e712b16 Mon Sep 17 00:00:00 2001
From: SergeyEzhin
Date: Wed, 31 Jan 2024 13:18:41 +0100
Subject: [PATCH 06/17] [DE mobile] Fix Bug 66261
---
apps/documenteditor/mobile/src/controller/Main.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index de139b16c1..f2dff92969 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -519,7 +519,7 @@ class MainController extends Component {
let value = LocalStorage.getItem("de-opensource-warning");
value = (value !== null) ? parseInt(value) : 0;
const now = (new Date).getTime();
- if (now - value > 86400000 && !isForm) {
+ if (now - value > 86400000) {
LocalStorage.setItem("de-opensource-warning", now);
f7.dialog.create({
title: _t.notcriticalErrorTitle,
From 176ecb96ce9dc0bb9710227df2926beccc38f846 Mon Sep 17 00:00:00 2001
From: "Julia.Svinareva"
Date: Fri, 2 Feb 2024 16:38:59 +0300
Subject: [PATCH 07/17] [SSE] Fix icons in custom date filter dlg
---
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
index 2751455a7c..e4b8866d4b 100644
--- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
@@ -181,7 +181,7 @@ define([
this.btnDatePicker1 = new Common.UI.Button({
parentEl: $('#id-btn-date-picker-1', this.$window),
cls: 'btn-toolbar bg-white',
- iconCls: 'toolbar__icon',
+ iconCls: 'toolbar__icon btn-date',
hint: this.txtSelectDate
});
this.btnDatePicker1.on('click', _.bind(this.showDatePicker, this));
@@ -189,7 +189,7 @@ define([
this.btnDatePicker2 = new Common.UI.Button({
parentEl: $('#id-btn-date-picker-2', this.$window),
cls: 'btn-toolbar bg-white',
- iconCls: 'toolbar__icon',
+ iconCls: 'toolbar__icon btn-date',
hint: this.txtSelectDate
});
this.btnDatePicker2.on('click', _.bind(this.showDatePicker, this));
From bebfd4ee38e913bc017cc86911b872e0da5b7e51 Mon Sep 17 00:00:00 2001
From: svetlana maleeva
Date: Fri, 2 Feb 2024 17:21:54 +0300
Subject: [PATCH 08/17] Update help
---
.../main/resources/help/en/Contents.json | 4 +-
.../resources/help/en/HelpfulHints/About.htm | 4 +-
.../help/en/HelpfulHints/AdvancedSettings.htm | 11 +-
.../en/HelpfulHints/CollaborativeEditing.htm | 4 +-
.../help/en/HelpfulHints/Commenting.htm | 14 +-
.../help/en/HelpfulHints/Communicating.htm | 4 +-
.../help/en/HelpfulHints/Comparison.htm | 12 +-
.../help/en/HelpfulHints/Password.htm | 6 +-
.../resources/help/en/HelpfulHints/Search.htm | 4 +-
.../help/en/HelpfulHints/SpellChecking.htm | 12 +-
.../help/en/HelpfulHints/SupportedFormats.htm | 57 +-
.../help/en/HelpfulHints/VersionHistory.htm | 6 +-
.../resources/help/en/HelpfulHints/Viewer.htm | 26 +-
.../help/en/ProgramInterface/FileTab.htm | 8 +-
.../help/en/ProgramInterface/HomeTab.htm | 2 +-
.../help/en/ProgramInterface/PluginsTab.htm | 43 +-
.../en/ProgramInterface/ProgramInterface.htm | 32 +-
.../en/ProgramInterface/ReferencesTab.htm | 2 +-
.../help/en/ProgramInterface/ViewTab.htm | 12 +-
.../help/en/UsageInstructions/AddBorders.htm | 4 +-
.../help/en/UsageInstructions/AddCaption.htm | 10 +-
.../en/UsageInstructions/AddHyperlinks.htm | 6 +-
.../UsageInstructions/AddTableofFigures.htm | 8 +-
.../UsageInstructions/AlignArrangeObjects.htm | 4 +-
.../help/en/UsageInstructions/AlignText.htm | 4 +-
.../en/UsageInstructions/BackgroundColor.htm | 2 +-
.../UsageInstructions/ChangeWrappingStyle.htm | 4 +-
.../help/en/UsageInstructions/ChatGPT.htm | 6 +-
.../CommunicationPlugins.htm | 2 +-
.../UsageInstructions/CreateFillableForms.htm | 47 +-
.../en/UsageInstructions/FillingOutForm.htm | 45 -
.../UsageInstructions/SavePrintDownload.htm | 6 +-
.../help/en/UsageInstructions/TerMef.htm | 27 +
.../resources/help/en/images/fill_form.png | Bin 1831 -> 1826 bytes
.../images/interface/desktop_pluginstab.png | Bin 10910 -> 18617 bytes
.../help/en/images/interface/filetab.png | Bin 29632 -> 32600 bytes
.../help/en/images/interface/pluginstab.png | Bin 17091 -> 16610 bytes
.../help/en/images/radio_button_settings.png | Bin 5997 -> 6566 bytes
.../resources/help/en/images/sortcomments.png | Bin 7957 -> 8726 bytes
.../main/resources/help/en/images/termef.png | Bin 0 -> 9832 bytes
.../help/en/images/view_form_role.png | Bin 2179 -> 3609 bytes
.../main/resources/help/en/search/indexes.js | 74 +-
.../main/resources/help/images/icons.png | Bin 86279 -> 86657 bytes
.../main/resources/help/images/sprite.css | 422 +++----
.../images/src/icons/sortcommentsicon.png | Bin 159 -> 124 bytes
.../main/resources/help/en/Contents.json | 3 +-
.../resources/help/en/HelpfulHints/About.htm | 4 +-
.../help/en/HelpfulHints/AdvancedSettings.htm | 5 +-
.../help/en/HelpfulHints/Commenting.htm | 1 +
.../help/en/ProgramInterface/HomeTab.htm | 5 +-
.../help/en/ProgramInterface/PluginsTab.htm | 2 +
.../en/UsageInstructions/FillingOutForm.htm | 37 +
.../help/en/images/fillable_form.png | Bin 0 -> 62357 bytes
.../images/interface/desktop_hometab_form.png | Bin 0 -> 9792 bytes
.../help/en/images/interface/hometab_form.png | Bin 0 -> 9775 bytes
.../help/en/images/interface/pluginstab.png | Bin 11465 -> 20254 bytes
.../resources/help/en/images/sortcomments.png | Bin 4635 -> 4748 bytes
.../main/resources/help/en/search/indexes.js | 15 +-
.../main/resources/help/images/icons.png | Bin 11064 -> 11661 bytes
.../main/resources/help/images/sprite.css | 94 +-
.../images/src/icons/saveas_form_icon.png | Bin 0 -> 253 bytes
.../images/src/icons/sortcommentsicon.png | Bin 159 -> 124 bytes
.../images/src/icons/submit_form_icon.png | Bin 0 -> 311 bytes
.../help/en/HelpfulHints/AdvancedSettings.htm | 4 +-
.../help/en/HelpfulHints/Commenting.htm | 3 +-
.../help/en/ProgramInterface/PluginsTab.htm | 19 +-
.../en/ProgramInterface/ProgramInterface.htm | 2 +-
.../en/UsageInstructions/AddingAnimations.htm | 4 +
.../help/en/images/animation_colors.png | Bin 0 -> 4741 bytes
.../images/interface/desktop_pluginstab.png | Bin 10821 -> 17756 bytes
.../help/en/images/interface/pluginstab.png | Bin 12880 -> 14880 bytes
.../resources/help/en/images/sortcomments.png | Bin 8459 -> 12922 bytes
.../main/resources/help/en/search/indexes.js | 14 +-
.../main/resources/help/images/icons.png | Bin 47398 -> 47121 bytes
.../main/resources/help/images/sprite.css | 210 ++--
.../images/src/icons/sortcommentsicon.png | Bin 159 -> 124 bytes
.../main/resources/help/en/Contents.json | 3 +-
.../help/en/HelpfulHints/AdvancedSettings.htm | 7 +-
.../help/en/HelpfulHints/Commenting.htm | 4 +-
.../help/en/ProgramInterface/DataTab.htm | 1 +
.../help/en/ProgramInterface/HomeTab.htm | 1 +
.../help/en/ProgramInterface/InsertTab.htm | 3 +-
.../en/ProgramInterface/PivotTableTab.htm | 1 +
.../help/en/ProgramInterface/PluginsTab.htm | 21 +-
.../en/ProgramInterface/ProgramInterface.htm | 4 +-
.../en/UsageInstructions/AddHyperlinks.htm | 2 +-
.../en/UsageInstructions/CopyPasteData.htm | 21 +
.../help/en/UsageInstructions/GoalSeek.htm | 38 +
.../help/en/UsageInstructions/InsertChart.htm | 14 +-
.../en/UsageInstructions/InsertFunction.htm | 21 +-
.../help/en/UsageInstructions/PivotTables.htm | 14 +-
.../UsageInstructions/SavePrintDownload.htm | 5 +-
.../resources/help/en/images/expand_last.png | Bin 0 -> 19821 bytes
.../resources/help/en/images/goal_seek.png | Bin 0 -> 3080 bytes
.../help/en/images/goal_seek_status.png | Bin 0 -> 3751 bytes
.../help/en/images/interface/datatab.png | Bin 10235 -> 9873 bytes
.../en/images/interface/desktop_datatab.png | Bin 10438 -> 10706 bytes
.../images/interface/desktop_editorwindow.png | Bin 45855 -> 117508 bytes
.../en/images/interface/desktop_hometab.png | Bin 15070 -> 13649 bytes
.../en/images/interface/desktop_inserttab.png | Bin 11866 -> 12141 bytes
.../interface/desktop_pivottabletab.png | Bin 11756 -> 13558 bytes
.../images/interface/desktop_pluginstab.png | Bin 10976 -> 17606 bytes
.../help/en/images/interface/editorwindow.png | Bin 54054 -> 122617 bytes
.../help/en/images/interface/hometab.png | Bin 14664 -> 12815 bytes
.../help/en/images/interface/inserttab.png | Bin 11471 -> 11244 bytes
.../en/images/interface/pivottabletab.png | Bin 12809 -> 12736 bytes
.../help/en/images/interface/pluginstab.png | Bin 15385 -> 14934 bytes
.../main/resources/help/en/images/margins.png | Bin 0 -> 3726 bytes
.../help/en/images/recommendedchart.png | Bin 0 -> 11578 bytes
.../help/en/images/series_context_menu.png | Bin 0 -> 5895 bytes
.../resources/help/en/images/series_menu.png | Bin 0 -> 6073 bytes
.../help/en/images/series_window.png | Bin 0 -> 5466 bytes
.../resources/help/en/images/sortcomments.png | Bin 9616 -> 12222 bytes
.../main/resources/help/en/search/indexes.js | 1004 ++++++++---------
.../main/resources/help/images/icons.png | Bin 55567 -> 55470 bytes
.../main/resources/help/images/sprite.css | 310 ++---
.../images/src/icons/sortcommentsicon.png | Bin 159 -> 124 bytes
117 files changed, 1494 insertions(+), 1336 deletions(-)
delete mode 100644 apps/documenteditor/main/resources/help/en/UsageInstructions/FillingOutForm.htm
create mode 100644 apps/documenteditor/main/resources/help/en/UsageInstructions/TerMef.htm
create mode 100644 apps/documenteditor/main/resources/help/en/images/termef.png
create mode 100644 apps/pdfeditor/main/resources/help/en/UsageInstructions/FillingOutForm.htm
create mode 100644 apps/pdfeditor/main/resources/help/en/images/fillable_form.png
create mode 100644 apps/pdfeditor/main/resources/help/en/images/interface/desktop_hometab_form.png
create mode 100644 apps/pdfeditor/main/resources/help/en/images/interface/hometab_form.png
create mode 100644 apps/pdfeditor/main/resources/help/images/src/icons/saveas_form_icon.png
create mode 100644 apps/pdfeditor/main/resources/help/images/src/icons/submit_form_icon.png
create mode 100644 apps/presentationeditor/main/resources/help/en/images/animation_colors.png
create mode 100644 apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/GoalSeek.htm
create mode 100644 apps/spreadsheeteditor/main/resources/help/en/images/expand_last.png
create mode 100644 apps/spreadsheeteditor/main/resources/help/en/images/goal_seek.png
create mode 100644 apps/spreadsheeteditor/main/resources/help/en/images/goal_seek_status.png
create mode 100644 apps/spreadsheeteditor/main/resources/help/en/images/margins.png
create mode 100644 apps/spreadsheeteditor/main/resources/help/en/images/recommendedchart.png
create mode 100644 apps/spreadsheeteditor/main/resources/help/en/images/series_context_menu.png
create mode 100644 apps/spreadsheeteditor/main/resources/help/en/images/series_menu.png
create mode 100644 apps/spreadsheeteditor/main/resources/help/en/images/series_window.png
diff --git a/apps/documenteditor/main/resources/help/en/Contents.json b/apps/documenteditor/main/resources/help/en/Contents.json
index 96c0188097..0a6d620c5e 100644
--- a/apps/documenteditor/main/resources/help/en/Contents.json
+++ b/apps/documenteditor/main/resources/help/en/Contents.json
@@ -59,7 +59,6 @@
{ "src": "UsageInstructions/CreateTableOfContents.htm", "name": "Create table of contents" },
{"src": "UsageInstructions/AddTableofFigures.htm", "name": "Add and Format a Table of Figures" },
{ "src": "UsageInstructions/CreateFillableForms.htm", "name": "Create fillable forms", "headername": "Fillable forms" },
- { "src": "UsageInstructions/FillingOutForm.htm", "name": "Filling Out a Form" },
{"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge", "headername": "Mail Merge"},
{ "src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations", "headername": "Math equations" },
{ "src": "HelpfulHints/CollaborativeEditing.htm", "name": "Co-editing documents in real time", "headername": "Collaboration" },
@@ -85,7 +84,8 @@
{"src": "UsageInstructions/Jitsi.htm", "name": "Make Audio and Video Calls"},
{"src": "UsageInstructions/Drawio.htm", "name": "Create and insert diagrams"},
{"src": "UsageInstructions/Zoom.htm", "name": "Host and schedule Zoom meetings"},
- {"src": "UsageInstructions/ChatGPT.htm", "name": "Use AI to write text"},
+ { "src": "UsageInstructions/ChatGPT.htm", "name": "Use AI to write text" },
+ {"src": "UsageInstructions/TerMef.htm", "name": "Insert definitions"},
{"src": "UsageInstructions/ViewDocInfo.htm", "name": "View document information", "headername": "Tools and settings"},
{"src": "UsageInstructions/SavePrintDownload.htm", "name": "Save, download, print your document" },
{"src": "HelpfulHints/AdvancedSettings.htm", "name": "Advanced settings of Document Editor"},
diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm
index f8b863e000..b1e8ccda6d 100644
--- a/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm
+++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm
@@ -18,8 +18,8 @@ About the Document Editor
The Document Editor is an online application that allows you to view through
and edit documents directly in your browser.
Using the Document Editor, you can perform various editing operations like in any desktop editor,
- print the edited documents keeping all the formatting details or download them onto your computer hard disk drive as DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB, DOCXF and OFORM files.
- To view the current software version, build number, and licensor details in the online version, click the icon on the left sidebar. To view the current software version and licensor details in the desktop version for Windows, select the About menu item on the left sidebar of the main program window. In the desktop version for Mac OS, open the ONLYOFFICE menu at the top of the screen and select the About ONLYOFFICE menu item.
+ print the edited documents keeping all the formatting details or download them onto your computer hard disk drive as DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB, DOCXF files.
+ To view the current software version, build number, and licensor details in the online version, click the icon on the left sidebar. To view the current software version and licensor details in the desktop version for Windows, select the About menu item on the left sidebar of the main program window. In the desktop version for macOS, open the ONLYOFFICE menu at the top of the screen and select the About ONLYOFFICE menu item.