Commit Graph

27 Commits

Author SHA1 Message Date
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
trovier
11e9644337 Added the list of supported multimedia formats 2023-04-25 15:25:47 +02:00
7daa5a5217 Build 7.2: Plugin manager, hyperlink to local file. 2022-09-12 17:36:10 +03:00
ceab06d0f7 Remove duplicates, unnecessary controls, edit See also links 2022-07-13 14:36:26 +03:00
f3fca21afc Remove old duplicate page 2022-04-21 14:48:27 +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
4b016334ac Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
f40394df57 Try to fix groups-guides-documents-collaborative-editing.aspx 2022-04-04 16:59:50 +03:00
f4f4fc2498 Remove two unnecessary duplicate pages for video support article 2022-03-31 17:12:57 +03:00
6583397eb4 Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
d399150766 Reworked OO Docs indexes in EN, DE, ES, IT, FR; changed screenshots as per build 12.0; fixed ChangingSettings (auto Trash bin). 2022-03-03 13:31:08 +03:00
9806e697fa Rename controls 2022-02-15 17:04:43 +03:00
553d84827c All editors_new features. 2021-07-13 16:45:33 +03:00
7b659856e6 Merge branch 'feature/add-links' into feature/build6.3
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.es.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.ru.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/ProgramInterface/PluginsTab.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/UsageInstructions/FontTypeSizeColor.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/FontTypeSizeColor.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/ParagraphIndents.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/Wordpress.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/ProgramInterface/PluginsTab.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertChart.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/PivotTables.htm
2021-03-31 17:57:54 +03:00
ec804128cd English articles for new features in OO Docs + English screenshots. 2021-03-22 16:53:42 +03:00
0719aecab9 Added new articles + the corresponding controls + screenshots. 2021-02-26 17:36:44 +03:00
0adf61240f Added new articles and their translation into German. 2021-02-24 14:44:53 +03:00
e07e9fb1b1 Revert "Deleted Video Support article from UserGuides"
This reverts commit 9e126a736c.
2020-11-17 14:26:31 +03:00
9e126a736c Deleted Video Support article from UserGuides 2020-10-07 15:53:14 +03:00
1a6f6ae738 Userguides docs: guides, added video-support article, ArticleCompleteList articles renamed 2020-10-06 18:42:22 +03:00
6aba5aac7c Update: added How to add new fonts to Desktop Editors guide 2020-04-30 09:39:19 +03:00
c27e29e232 New articles and updates: user guides about document editors 2019-11-11 15:25:00 +03:00
08eb92344a New articles: new user guides for document editors 2019-11-01 17:53:56 +03:00
alexandervnuchkov
ab5ef7953f New articles: new user guides for document editors 2019-10-31 18:44:56 +03:00
alexandervnuchkov
05182cecc6 New articles: user guides for document editors 2019-10-29 18:47:02 +03:00
alexandervnuchkov
90e0618c29 New articles: user guides for editors 2019-10-28 18:43:32 +03:00