Commit Graph

180 Commits

Author SHA1 Message Date
0974eb0f21 For bur 63045 2023-10-17 11:07:58 +03:00
7da3b35973 Merge branch 'feature/shortcuts' into release/1.17.0
# Conflicts:
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/images/keytips1.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/images/keytips2.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/images/keytips1.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/images/keytips2.png
2023-10-17 11:02:09 +03:00
94e1d45047 Merge branch 'feature/build7.5' into release/1.17.0 2023-10-17 11:00:30 +03:00
b2ba874e17 Edit contents.json (fr) and SideMenu 2023-10-17 10:45:18 +03:00
5fd0d7de3b Update indexes.js 2023-10-17 10:32:01 +03:00
c9c98bb28c Minor fix and typos 2023-10-17 04:08:53 +03:00
698c6f35a9 Update indexes.js 2023-10-16 13:58:42 +03:00
c1a61c0c81 Add translations (fr) 2023-10-13 18:32:00 +03:00
9f9f56cde0 Fix shortcut - for bug 64441 2023-10-09 12:40:21 +03:00
5480907cb5 For bug 64441 2023-10-02 15:36:49 +03:00
eebb41c3a4 Fix shortcuts (de, fr) - for bug 63708 2023-08-21 17:46:53 +03:00
3e1871e378 Move editor.css to common folder according to changes in web-apps 2023-08-14 16:52:35 +03:00
b881b7802d Merge branch 'feature/chatgpt' into release/1.14.0
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/ChatGPT.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/ChatGPT.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/ChatGPT.htm
2023-07-27 13:09:05 +03:00
2f84d0300b Merge branch 'feature/build_7.4' into release/1.14.0 2023-07-20 14:08:28 +03:00
002e9427dc Update fr (ChatGPT) 2023-07-19 08:56:03 +03:00
368e458681 Fix path for chatgpt screen (fr) 2023-07-13 12:27:10 +03:00
150b0e179a Fix paths for Zoom screen (de, fr) 2023-07-13 12:20:26 +03:00
ed2734d2f8 Fix menu (fr) 2023-07-13 11:34:17 +03:00
90d74f028a Update translations (fr), minor fixes (en) 2023-07-12 17:45:53 +03:00
14d8f0aacc Add margin-left for search field 2023-07-10 17:41:27 +03:00
072abd32aa Edit Contents.json (fr) 2023-07-10 16:22:11 +03:00
69e2a364fe Fix Contents.json (fr) 2023-07-05 10:56:11 +03:00
bcd7ea6a0b Fix bug 63260 (edit Contents.json) 2023-07-04 12:43:56 +03:00
69cd8466d0 Add images (fr) 2023-06-28 16:37:02 +03:00
8f77d6cceb Add translations for v7.4 (fr), update indexes.js (fr, de) 2023-06-28 15:02:39 +03:00
ffbdddef3b Update callback.js again 2023-06-16 15:32:01 +03:00
05e1273979 Update copyright (for embedded help - according to web-apps) 2023-06-16 14:53:09 +03:00
6d42c320cf Edit Side menu, fix AllowEditRanges link 2023-06-13 11:31:41 +03:00
e6e458b922 Merge branch 'develop' into feature/build_7.4
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx
2023-06-01 15:59:33 +03:00
trovier
67786206bd Edited keyboard shortcuts (all languages), fixed links for new ProtectRanges.htm 2023-05-25 12:55:13 +02:00
61e42a3acd Additional fixes for renaming 2023-05-24 19:13:49 +03:00
trovier
62c2e59edf Fixes .json and ArticlesCompleteList/ONLYOFFICEEditors for ProtectRanges.htm 2023-05-24 17:51:37 +02:00
trovier
584aca854d No Responsibility disclaimer for ChatGPT added (French) 2023-04-25 15:29:30 +02:00
c0add416a5 Merge branch 'feature/new_plugins' into release/1.11.0 2023-03-24 15:50:18 +03:00
0c6b09e65d Add translations for new plugins pages (fr) 2023-03-16 14:20:15 +03:00
13c97a96df Add external link translation (fr) 2023-03-15 18:16:29 +03:00
48edd2dcd8 Merge branch 'feature/build_7.3' into release/1.9.0
# Conflicts:
#	Web/Controls/Help/Server/Document/DSChangelog.ascx
#	Web/Controls/Help/Server/Document/DSChangelog.ru.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/HelpfulHints/Navigation.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/HelpfulHints/Password.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/ProgramInterface/ProgramInterface.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/HelpfulHints/Navigation.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertText.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/HelpfulHints/Navigation.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/HelpfulHints/Password.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/ProgramInterface/DataTab.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/CopyPasteData.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertArrayFormulas.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertChart.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertFunction.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
2023-01-31 11:28:22 +03:00
a0b57415c7 Fix images for Left, Mid, Right functions pages - all languages 2023-01-30 18:13:51 +03:00
a989d1609f Update translations and indexes.js (FR) 2023-01-30 15:49:19 +03:00
846de002f0 Update indexes.js (ru) and de, fr for SE 2023-01-27 18:51:57 +03:00
12abdfb9ae Delete Password from HelpfulHints (se) 2023-01-27 18:30:59 +03:00
c97f00f31d Update indexes.js (de, en, fr) 2023-01-27 17:53:28 +03:00
0d5f543289 Update translations and images (FR) 2023-01-27 17:22:33 +03:00
265cad72b1 Fix shortcuts once again 2023-01-26 18:39:51 +03:00
cece4d6e75 Fix shortcuts again 2023-01-26 16:20:10 +03:00
dcdf5c2da8 New fixes for mac shortcuts 2023-01-26 15:22:24 +03:00
e294bd79d8 Fix shortcuts for macos 2023-01-25 12:55:48 +03:00
trovier
064cb5c9be InsertSmartArt link fix for EN, DE, FR, RU 2023-01-20 11:58:33 +01:00
cb9ac9beed Add translations (FR) 2023-01-11 14:06:47 +03:00
b317caebf8 Edit shortcuts for MacOS 2022-12-30 17:49:08 +03:00