Commit Graph

45 Commits

Author SHA1 Message Date
c3e589e3eb Edit several tags 2022-11-02 16:26:50 +03:00
2eeee22a89 Build 7.2: Fixes as per testing (EN only). 2022-09-07 17:09:11 +03:00
f6e115fe85 Merge branch 'feature/translations-fr-new' into feature/web-apps-help
# Conflicts:
#	Web/AdministratorGuides/Mass-mailing.aspx
#	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/Tags/add-event/add-event.de.ascx
#	Web/Controls/Help/Tags/change-color/change-color.ascx
#	Web/Controls/Help/Tags/change-color/change-color.de.ascx
#	Web/Controls/Help/Tags/change-color/change-color.es.ascx
#	Web/Controls/Help/Tags/create-event/create-event.de.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.de.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.es.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.fr.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.it.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ru.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.fr.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.ru.ascx
#	Web/Controls/Help/UserGuides/DocsSE.ascx
#	Web/Controls/Help/UserGuides/DocsSE.de.ascx
#	Web/Controls/Help/UserGuides/DocsSE.fr.ascx
#	Web/Controls/Help/UserGuides/DocsSE.it.ascx
#	Web/Controls/Help/UserGuides/DocsSE.ru.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/GroupsDocuments.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.de.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.fr.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.ru.ascx
2022-08-02 13:12:08 +03:00
5f537bfe5e Merge branch 'feature/fix-merge-cells' into feature/web-apps-help
# Conflicts:
#	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 10:58:59 +03:00
1c0b4aa46c Continue editing controls for Video.ascx 2022-07-29 17:53:56 +03:00
333e5241a1 Edit tags for InsertTables.aspx 2022-07-22 14:27:12 +03:00
93e389e9ed Edit tags for pages from Editing cell properties section 2022-07-15 17:28:45 +03:00
4164537cda Reconnect align-text tag 2022-07-14 19:49:17 +03:00
cebfbbde76 Reconnect 2 tags on all pages 2022-07-11 14:43:34 +03:00
11ea5943ca Change masters for other pages - SSE, PE 2022-06-23 12:01:11 +03:00
eaf0081bb1 Try to fix displaying images for pages: Program Interface, Insert Images 2022-06-22 10:55:53 +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
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
226eeddf1a Merge branch 'feature/build7.1' into feature/build7.1-for-release
# Conflicts:
#	Web/Controls/Help/Installation/Docs.ascx
#	Web/Controls/Help/Installation/DocsCommunity.ascx
#	Web/Controls/Help/Installation/DocsDeveloper.ascx
#	Web/Controls/Help/Installation/DocsEnterprise.ascx
#	Web/Controls/Help/Installation/Installation.ascx
2022-04-15 15:29:03 +03:00
5ca9fffc48 Add aspx pages and menu for new htm pages 2022-04-12 14:49:46 +03:00
4da7d887ff Fix insert-objects.ascx for desktop-video-support.aspx 2022-04-04 11:41:57 +03:00
541bc4c7f6 Try to fix workspace-saas-change-payment-plan.aspx 2022-03-31 13:12:04 +03:00
6583397eb4 Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
abd9e76396 Fixes for groups-gettingstarted-projects.aspx - Part 2 2022-03-25 14:13:39 +03:00
11539f099b Fixes for groups-gettingstarted-projects.aspx Part 1 2022-03-24 09:59:42 +03:00
908e7a5a02 Remove old redirected pages for user guides section 2022-03-23 10:11:37 +03:00
daeb2f6bdc Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
e88968f0ec Rework: Collaboration section (SSE, PE). 2022-03-10 18:05:09 +03:00
481cbd1cd5 Add new and update existing articles for 7.0 2021-12-03 18:18:12 +03:00
5d52e36aa8 Merge branch 'feature/communication_plugins' into release/1.2.0
# Conflicts:
#	Changelog.md
2021-11-24 19:51:08 +03:00
SvetlanaLisina
5526849ebf Фикс прекомпиляции хелпцентра
# Conflicts:
#	Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
#	Web/Controls/Help/GettingStarted/Integration/Mattermost/GettingStartedMattermost.ascx
#	Web/Integration/gettingstarted-mattermost.aspx
#	Web/Integration/gettingstarted-redmine.aspx
2021-11-24 19:02:19 +03:00
8871ab3084 Updated classes for Plugins.aspx pages; updated Changelog.md 2021-10-13 14:38:53 +03:00
603ab47cfb Added Communication Plugins articles (Telegram, Rainbow) 2021-10-08 17:28:01 +03:00
e132c787b5 Structure changes: added Forms section to all new menus, updated links to editors pages in menus, renamed password aspx according to htm, added new pages to sitemap, updated tags 2021-03-30 14:23:37 +03:00
f443219c03 Added .aspx for password.htm and xlookup.htm + controls in ArticlesCompleteList + corresponding tags + added articles on passwords to main menu for each editor
Included guide on Dark theme into ArticlesCompleteList.
2021-03-26 15:05:34 +03:00
53c515a803 Merge branch 'plugins' into editors6.0-new
# Conflicts:
#	Web/Controls/Help/Tags/CompleteArticleList.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/ProgramInterface/PluginsTab.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/ProgramInterface/ProgramInterface.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertSymbols.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertSymbols.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertSymbols.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/ProgramInterface/PluginsTab.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertSymbols.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertSymbols.htm
2020-10-02 12:28:38 +03:00
e995c5f863 Added aspx pages and controls for new htm pages, added links into lists and tags 2020-09-10 17:53:00 +03:00
594c702cac Fixed links for Highlighted Code articles (PE, SE) 2020-07-16 16:03:19 +03:00
f5bf9482ab Added Plugins as a section 2020-07-14 16:42:42 +03:00
f27fcc485f Update: added How to use plugins articles - OfficeWeb 2020-07-06 18:34:19 +03:00
8e336e927f New articles and images (Document, Presentation, Spreadsheet Editors) 2020-02-03 18:12:11 +03:00
alexandervnuchkov
7375ca982f Updates: updated documentation for document editors 2019-10-14 18:30:21 +03:00
alexandervnuchkov
a360d19111 Updates: updates to the editors documentation 2019-10-11 18:35:51 +03:00
alexandervnuchkov
470f8ad50a Updates: updated the scripts to use variables from editor documentation 2019-04-17 18:57:00 +03:00
alexandervnuchkov
d86852d7e0 New articles: updates to the editors documentation (due to version 5.1.0 release) 2018-04-04 15:25:54 +03:00
alexandervnuchkov
8542631cbf New articles: program interface description for the editors 2017-12-15 11:42:34 +03:00
alexandervnuchkov
3c5cd7e771 Corrections and new articles: ONLYOFFICE Editors 2017-08-10 17:30:01 +03:00
alexandervnuchkov
c0efdbf999 Enhancement: removed unused IDs (part I) 2017-07-17 18:09:27 +03:00
alexandervnuchkov
7a855d6a1d правки по редакторам 2017-03-10 15:04:44 +03:00
alexandervnuchkov
71f171fb08 First commit 2016-08-29 16:51:20 +03:00