Commit Graph

386 Commits

Author SHA1 Message Date
b30405a09d Continue replacing div tags 2022-06-24 18:32:36 +03:00
2060b76925 Start replacing <div> with <span> within <p></p> 2022-06-23 18:29:49 +03:00
7dd6f96552 Fix uppercase letters in Viewer.htm (en, fr) 2022-06-23 13:42:11 +03:00
85a53f2c4c Fix InsertDropCap.htm file name 2022-06-21 13:48:32 +03:00
4960189a5d Replace 'apps' folder with the new one from 'web-apps' repository 2022-06-21 13:12:39 +03:00
1db74d5562 Add missing image 2022-05-27 17:24:08 +03:00
8a689a58d6 Update Contents.json 2022-05-27 15:51:16 +03:00
f00aed2dc6 Translation for Mattermost and Jitsi. 2022-05-27 15:43:16 +03:00
46bf7caecb Merge remote-tracking branch 'remotes/origin/feature/drawio' into develop
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/Contents.json
2022-05-27 15:37:12 +03:00
b0e56ce213 Fix KeyboardShortcuts.htm - DE, PE, SSE 2022-05-26 16:59:29 +03:00
4fda1496f1 Update screenshot of Drawio 2022-05-25 16:13:09 +03:00
11b6de4987 OfficeWeb - various fixes to RU 2022-05-24 16:26:36 +03:00
eafa04eefc Fix misprints in Drawio 2022-05-19 16:44:20 +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
3a3b5d04b2 Update translations - fr 2022-05-11 17:08:55 +03:00
b81711db77 Rename PdfViewer.htm to Viewer.htm, minor text fixes 2022-05-11 11:51:18 +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
6bd7f4cdc3 Fix formatting for PdfViewer.htm 2022-05-08 12:53:03 +03:00
0320d8447c Fix PdfViewer.htm 2022-05-07 11:37:58 +03:00
4c9c9e0d7c Update PdfViewer.htm RU 2022-05-06 17:15:11 +03:00
599d2fdd64 German translation for reworked Collaboration section for editors. 2022-05-05 18:46:34 +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
295c4fa203 Add Drawio plugin page 2022-05-05 17:43:20 +03:00
51397d20b7 Reset commit 7e1f682 SupportSmartArt.htm for DE, SE 2022-05-05 14:52:56 +03:00
79ff5364ad Minor fixes for all editors - en 2022-05-05 14:28:24 +03:00
8e918412fe DE translations for RU 2022-05-05 14:04:00 +03:00
91adee86e6 Fixes as per testing; new German translations. 2022-05-05 14:00:21 +03:00
5a2f642af0 Fix SupportSmartArt.htm - all editors 2022-05-04 12:27:53 +03:00
183bb77be8 Fix PdfViewer.htm and pdfviewer.png 2022-05-04 10:23:55 +03:00
2d724c12e5 Fix PdfViewer.htm 2022-04-29 13:52:31 +03:00
f01a172d9b New fixes for PdfViewer.htm and SupportSmartArt.htm 2022-04-28 17:28:09 +03:00
10fa1d7977 Fix PdfViewer.htm 2022-04-28 12:32:20 +03:00
9a455382af Minor fixes in German. 2022-04-28 12:31:35 +03:00
bffdb9e476 Minor fixes in German. 2022-04-27 16:40:57 +03:00
3b79e6ccf8 Fixes for all editors EN 2022-04-26 11:07:55 +03:00
2dbccfc365 Add note for sorting by group 2022-04-26 11:05:32 +03:00
dc8fd98223 Fixes for all editors EN 2022-04-26 10:53:55 +03:00
bd9ea13992 Update jitsi_plugin.gif 2022-04-25 17:45:54 +03:00
1b2982907a Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-22 13:11:26 +03:00
fe91c26c77 Collaboration section (EN) for all editors: fixed links. 2022-04-22 12:40:28 +03:00
cb1effe260 Merge branch 'feature/build7.1' into feature/build7.1-for-release 2022-04-20 18:34:45 +03:00
1dc034de40 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/Controls/Help/Administration/Administration.ascx
#	Web/Controls/Help/Administration/ControlPanel.ascx
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.ascx
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.de.ascx
#	Web/Controls/Help/ArticlesCompleteList/Guides/151_share_text/151_share_text.ascx
#	Web/Controls/Help/ArticlesCompleteList/ONLYOFFICEEditors/2021_using-chat.ascx
#	Web/Controls/Help/ArticlesCompleteList/TipsTricks/130_folder_permissions/130_folder_permissions.ascx
#	Web/Controls/Help/Desktop/Documents/Common/PrivateRoom/PrivateRoom.de.ascx
#	Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.de.ascx
#	Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx
#	Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/EditorsUserGuides.ascx
#	Web/Controls/Help/Tags/generate-report/generate-report.ascx
#	Web/Controls/Help/Tags/generate-report/generate-report.de.ascx
#	Web/Controls/Help/Tags/manage-access-rights/manage-access-rights.ascx
#	Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.ascx
#	Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.de.ascx
#	Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.ascx
#	Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.de.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.de.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.es.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.fr.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.it.ascx
#	Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ru.ascx
#	Web/Controls/Help/Tags/report-templates/report-templates.ascx
#	Web/Controls/Help/Tags/report-templates/report-templates.de.ascx
#	Web/Controls/Help/Tags/security/security.ascx
#	Web/Controls/Help/Tags/security/security.de.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.de.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.es.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.fr.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.it.ascx
#	Web/Controls/Help/Tags/track-birthdays/track-birthdays.ru.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.fr.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.fr.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.ru.ascx
#	Web/Controls/Help/UserGuides/Groups.ascx
#	Web/Controls/Help/UserGuides/Groups.de.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.ascx
#	Web/Controls/Help/UserGuides/GroupsMail.de.ascx
#	Web/Controls/Help/UserGuides/GroupsProjects.ascx
#	Web/Controls/Help/UserGuides/GroupsProjects.de.ascx
#	Web/Controls/Help/UserGuides/UserGuides.ascx
#	Web/ONLYOFFICE-Editors/Editors-User-Guides/DocumentEditor/Add-watermark.aspx
#	Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-and-unmerge-cells.aspx
#	Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-cells.aspx
2022-04-20 16:11:30 +03:00
3dd2d0d01e Fixes for all editors - DE 2022-04-20 15:05:59 +03:00
ce01c6eb09 Fixes for all editors - EN 2022-04-20 11:05:13 +03:00
1cf4614258 Fixes for all editors - EN 2022-04-20 10:56:41 +03:00
d012cf3b93 Fix Jitsi 2022-04-20 10:49:56 +03:00