Commit Graph

637 Commits

Author SHA1 Message Date
6c44bcb6f6 Merge branch 'feature/linode' into release/1.14.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/Controls/Help/Tags/document-server/document-server.ascx
2023-07-27 13:45:58 +03:00
d6bd3e845f Merge branch 'feature/build_7.4' into release/1.13.0 2023-06-13 11:36:13 +03:00
7c73673533 Merge branch 'feature/structure' into release/1.13.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
2023-06-09 18:35:46 +03:00
521dd3390a Merge branch 'feature/translations-fr-new' into release/1.13.0 2023-06-09 18:30:55 +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
4c1dfb42da Remove article about Workspace Cloud registration 2023-05-31 18:25:28 +03: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
be1cb959d7 Add Speech Input plugin 2023-05-19 14:53:38 +03:00
a080447597 Edit math-trigonometry-functions.ascx tag 2023-05-02 18:51:02 +03:00
1649678fb3 Add translation, edit controls 2023-04-26 13:04:27 +03:00
trovier
11e9644337 Added the list of supported multimedia formats 2023-04-25 15:25:47 +02:00
d2db11f171 Edit financial-functions.ascx tag 2023-04-21 15:59:54 +03:00
22c4c39419 Edit engineering-functions.ascx tag 2023-04-11 18:40:37 +03:00
0e53b85f9d Remove outdated controls, edit 3 tags 2023-04-10 17:10:41 +03:00
043689366c Merge branch 'feature/workspace-12.5' into release/1.11.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
#	Web/Controls/Help/ABCIndex/ABCCompleteArticleList.ascx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/CommunicationPlugins.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HTML.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HighlightedCode.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertReferences.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Jitsi.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/PhotoEditor.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Speech.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Thesaurus.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Translator.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Typograf.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/WordCounter.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/CommunicationPlugins.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/HighlightedCode.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/PhotoEditor.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Thesaurus.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Translator.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/CommunicationPlugins.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/HighlightedCode.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PhotoEditor.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Thesaurus.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Translator.aspx
2023-03-24 16:21:30 +03:00
a95c47748c Merge remote-tracking branch 'remotes/origin/feature/ios_7.3' into release/1.11.0
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2023-03-24 15:48:22 +03:00
897feb691d Merge branch 'feature/android_v5.6' into release/1.11.0 2023-03-24 15:45:13 +03:00
3cf2880f0c Edit tag 2023-03-23 17:35:14 +03:00
44a4b5b42e Edit two tags 2023-03-17 16:21:21 +03:00
d153102a14 Edit controls in articles complete list, edit several tags 2023-03-15 17:30:01 +03:00
2e85a9408e Continue fixes in ArticlesCompleteList 2023-03-10 14:13:11 +03:00
ca6ab5d94a Partial structure fixes in ArticlesCompleteList 2023-03-09 14:40:17 +03:00
0da1eada3f Merge branch 'feature/mattermost-new' into release/1.10.0
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2023-03-06 18:04:40 +03:00
f21c5195ea Update translations (fr) 2023-03-06 13:58:50 +03:00
8da0ec1555 Add DE articles 2023-02-28 13:55:23 +03:00
7702ab867d Add translations (fr) 2023-02-27 11:24:00 +03:00
83210312ae Merge branch 'develop' into feature/workspace-12.5
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
2023-02-22 15:11:53 +03:00
5f92087db8 Move missing files and changes from old Mattermost branch 2023-02-21 16:14:20 +03:00
a3986844bd Edit controls in ArticlesCompleteList and .resx files for Installation -> Desktop section 2023-02-13 12:53:58 +03:00
abe732a8cc Add Deploying ONLYOFFICE Docs in Linode article 2023-02-09 23:29:52 +03:00
1899f5c892 Merge branch 'feature/structure' into release/1.9.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
2023-01-31 11:37:55 +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
a6859bed51 Edit tags: text-data-functions.ascx, using-functions.ascx, using-named-ranges.ascx; edit several aspx pages 2023-01-30 15:31:27 +03:00
ccca1e560a Partial fixes for text-data-functions.ascx tag 2023-01-26 18:24:19 +03:00
d73a91ae18 Edit lookup-reference-functions.ascx tag, start editing text-data-functions.ascx tag 2023-01-26 14:09:07 +03:00
34edd26c06 Updates for memory quota 2023-01-11 10:39:30 +03:00
trovier
bf0fa6e1f3 German translation update (no interface screenshots, waiting for keys) 2023-01-10 13:26:02 +01:00
91ae3916b4 Translate minor fixes and CreateFillableForms.htm 2023-01-09 17:38:45 +03:00
trovier
d270be856a Minor fixes (EN). 2022-12-20 18:57:56 +01:00
trovier
680da08169 Initial commit (EN only). 2022-12-16 15:16:45 +01:00
2e8b8fcfb6 Updates for v12.5 (impersonation, dark theme, branding, password length) 2022-12-13 16:27:21 +03:00
abb963cd46 Add new article, new section and fixes for Docs Cloud 2022-11-23 15:44:04 +03:00
0bbda1b219 Merge branch 'feature/issue31' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.resx
2022-11-18 16:48:02 +03:00
9adeed9022 Merge branch 'feature/structure-fixes' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.it.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/ABCIndex/ABCCompleteArticleList.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrToolsAndSettings/AndrChangeSpreadsheetSettings/AndrChangeSpreadsheetSettings.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PresentationEditorTableOfContents/PresentationEditorTableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PresentationEditorTableOfContents/PresentationEditorTableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PresentationEditorTableOfContents/PresentationEditorTableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.ru.ascx
#	Web/Controls/Help/Tags/TagsCompleteArticleList.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.de.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.es.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.fr.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.it.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.ru.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.de.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.es.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.fr.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.it.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.ru.ascx
#	Web/Controls/Help/Tags/page-size/page-size.ascx
#	Web/Controls/Help/Tags/page-size/page-size.de.ascx
#	Web/Controls/Help/Tags/page-size/page-size.es.ascx
#	Web/Controls/Help/Tags/page-size/page-size.fr.ascx
#	Web/Controls/Help/Tags/page-size/page-size.it.ascx
#	Web/Controls/Help/Tags/page-size/page-size.ru.ascx
2022-11-14 12:15:47 +03:00
49112c908e Merge branch 'feature/android-5.5.0' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/ArticlesCompleteList/MobileApps/4338_mob_andr_endnotes.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrOperationsOnObjects/AndrAdjustChartSettings/AndrAdjustChartSettings.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrToolsAndSettings/AndrSaveExportPrintDoc/AndrSaveExportPrintDoc.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPEOperationsOnObjects/AndrPEAdjustChartSettings/AndrPEAdjustChartSettings.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrToolsAndSettings/AndrChangeSpreadsheetSettings/AndrChangeSpreadsheetSettings.fr.ascx
2022-11-14 11:29:46 +03:00
da589b70d7 Merge branch 'feature/help_fixes' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.it.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrCellTextFormatting/AndrSEFontTypeSizeColor/AndrSEFontTypeSizeColor.fr.ascx
#	Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/SpreadsheetEditor/FreezeRowsColumns/FreezeRowsColumns.fr.ascx
#	Web/Controls/Help/Tags/TagsCompleteArticleList.ascx
2022-11-14 10:42:10 +03:00
975641a499 Edit font-formatting.ascx and other tags 2022-11-08 18:27:55 +03:00
153ac52a12 Edit paragraph-formatting.ascx and other tags 2022-11-03 16:17:39 +03:00
trovier
eb2f17a724 Merge branch 'feature/help_fixes' of https://github.com/ONLYOFFICE/helpcenter into feature/help_fixes
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
2022-11-02 17:02:18 +03:00