Commit Graph

484 Commits

Author SHA1 Message Date
4a3695e58c Edit MergeCells.htm 2022-08-02 20:09:11 +03:00
32f1d0849e Merge branch 'feature/fix-merge-cells' into release/1.6.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/UsageInstructions/MergeCells.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/MergeCells.htm
2022-08-02 16:12:29 +03:00
cfbf4529b1 Merge branch 'feature/web-apps-help-german' into release/1.6.0 2022-08-02 14:27:19 +03:00
f5102f0e4c Edit formatting for MergeCells.htm 2022-08-01 18:48:31 +03:00
4e1017b29a Fix image paths again 2022-08-01 17:13:49 +03:00
f785648576 Fix MergeCells.htm - en, de (remove classes used for .ascx, replace image paths) 2022-08-01 16:35:20 +03:00
e4adf67c70 Fixes for images and articles. 2022-07-28 18:28:29 +03:00
3cd32e96c5 Merge branch 'feature/web-apps-help-fr' into release/1.6.0 2022-07-28 16:52:25 +03:00
2fcbfca213 Update translations (FR) - Collaboration section 2022-07-26 13:42:44 +03:00
8d2896636b Spreadsheet Editor, UsageInstructions: translation and images updated. 2022-07-22 18:04:57 +03:00
19bdadd300 Spreadsheet Editor, ProgramInterface: translation and images update. 2022-07-21 18:06:41 +03:00
68a9cb90aa Spreadsheet Editor, HelpfulHints: translation and images update. 2022-07-21 18:00:11 +03:00
3d44f05afd Merge branch 'feature/web-apps-help' into release/1.6.0
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/it/HelpfulHints/SupportedFormats.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/it/HelpfulHints/SupportedFormats.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/HelpfulHints/SupportedFormats.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/it/HelpfulHints/SupportedFormats.htm
2022-07-19 16:34:01 +03:00
a47cde1e35 Merge branch 'feature/supported-formats' into release/1.6.0 2022-07-14 12:09:56 +03:00
650f415d1e Add translations for SupportedFormats.htm - fr, es 2022-07-13 18:18:14 +03:00
2751d38a19 German translation. 2022-07-01 15:07:14 +03:00
65d279d8c6 Finish editing Spreadsheet Editor pages 2022-06-28 17:39:39 +03:00
ed858d012e Start editing pages for Spreadsheet Editor 2022-06-27 18:41:08 +03:00
4e85e9bf29 Change SupportedFormats.htm in all languages according to EN 2022-06-27 11:04:46 +03:00
f071339d55 Add a link to api site 2022-06-24 18:57:41 +03:00
e905a98cff Fixes for SupportedFormats.htm 2022-06-23 10:54:38 +03:00
a7975b360d Try to rework Download section 2022-06-22 16:38:50 +03:00
e80710fe36 Edit supported formats (view after conversion, order, etc.) 2022-06-22 15:19:40 +03:00
4960189a5d Replace 'apps' folder with the new one from 'web-apps' repository 2022-06-21 13:12:39 +03:00
b0e56ce213 Fix KeyboardShortcuts.htm - DE, PE, SSE 2022-05-26 16:59:29 +03:00
11b6de4987 OfficeWeb - various fixes to RU 2022-05-24 16:26:36 +03:00
972db93ee6 Add InsertArrayFormulas article to SE (ru) 2022-05-24 15:35:14 +03:00
868ae00d81 Final fixes for OO SSE RUS. 2022-05-20 15:00:33 +03:00
8fa5345c4a Minor fixes for OO SSE RUS. 2022-05-19 14:27:18 +03:00
e0425c37f6 Minor fixes for OO SSE RUS. 2022-05-18 18:17:18 +03:00
7b3cb5d0a6 Minor fix for OO SSE RUS. 2022-05-18 14:57:05 +03:00
f081153d97 Merge branch 'develop' of https://github.com/ONLYOFFICE/helpcenter into develop 2022-05-18 14:36:43 +03:00
5d94f63c03 Minor fixes for OO SSE RUS. 2022-05-18 14:36:12 +03:00
21aceb08e6 Add 2 missing images 2022-05-16 18:36:45 +03:00
38353ae581 Add missing images and move one page in languages 2022-05-16 18:24:46 +03:00
ee23359edd Restore missing Convert equations section - de, fr 2022-05-16 13:46:16 +03:00
049a22ed5d Update indexes.js and Contents.json 2022-05-16 11:54:50 +03:00
7606e4da5b Fix Download column, add docm, xlsb 2022-05-13 18:47:56 +03:00
d06c01ab12 Finish updating SupportedFormats.htm 2022-05-12 14:32:14 +03:00
3a3b5d04b2 Update translations - fr 2022-05-11 17:08:55 +03:00
8d71664100 Merge branch 'feature/helpcenter_12.0-for-release' into release/1.4.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/HelpCenter.de.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.it.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.ru.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.it.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.de.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.de.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.it.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.es.ascx
#	Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.it.ascx
#	Web/Controls/Help/VariousControls/LocalizeControls/SpreadsheetProtection/LocalizeSpreadsheetProtection.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Review.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/images/acceptreject_dropdown.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
2022-05-09 17:02:25 +03:00
c87b36fd38 Merge branch 'feature/build7.1-for-release' into release/1.4.0
# Conflicts:
#	Web/Controls/Help/Installation/DocsDeveloper.ascx
2022-05-09 15:22:16 +03:00
cbbe65f8ba Update indexes.js - en, de, fr, ru 2022-05-09 14:02:42 +03:00
599d2fdd64 German translation for reworked Collaboration section for editors. 2022-05-05 18:46:34 +03:00
329afe4d94 SE Add dragndrop sheets gif to FR, DE 2022-05-05 18:41:54 +03:00
93a131984b Merge branch 'feature/build7.1' into feature/build7.1-for-release
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/PdfViewer.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/UsageInstructions/AddingAnimations.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/SupportSmartArt.htm
2022-05-05 18:38:54 +03:00
51397d20b7 Reset commit 7e1f682 SupportSmartArt.htm for DE, SE 2022-05-05 14:52:56 +03:00
c8f1c2f77b Merge branch 'feature/build7.1' of https://github.com/ONLYOFFICE/helpcenter into feature/build7.1 2022-05-05 14:43:30 +03:00
79ff5364ad Minor fixes for all editors - en 2022-05-05 14:28:24 +03:00
fde42346e8 SE translations for RU 2022-05-05 14:26:46 +03:00