Commit Graph

97 Commits

Author SHA1 Message Date
c1f8f04951 Display documentation about editors on test-helpcenter (for test only) 2023-12-06 12:30:06 +03:00
6fcc871a0c FIX rewrite rules order 2023-11-30 08:51:28 +03:00
890c3a5a15 ADD rewrite rules for integration 2023-11-29 16:11:44 +03:00
dbcecf5871 ADD rewrite rules for integration 2023-11-29 16:09:36 +03:00
4c1dfb42da Remove article about Workspace Cloud registration 2023-05-31 18:25:28 +03:00
dbf5ccb2e1 Fix #47 2023-04-10 14:25:20 +03:00
9b5fe7a64a Edit onlyoffice-online-editor-settings.ascx tag, remove unnecessary files 2022-10-05 13:43:14 +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
ceab06d0f7 Remove duplicates, unnecessary controls, edit See also links 2022-07-13 14:36:26 +03:00
bacaa0d29c Merge branch 'feature/projects_ios' into develop 2022-07-12 18:03:32 +03:00
7029e97cba Deleted unused folders, redirect to index. Made 'Available languages' visible in the index. 2022-07-05 18:20:02 +03:00
e72394a98c Merge branch 'feature/andr5.4+web' into release/1.5.0 2022-05-31 14:09:58 +03:00
66c73b05e0 Fix bug 57343 2022-05-27 16:22:27 +03:00
e4eb071b6f Update Android Documents to v5.4 2022-05-13 07:25:12 +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
26b7ce1020 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/web.config
2022-04-26 16:38:08 +03:00
d61e938711 Deleted two unused articles, set redirect. 2022-04-26 14:53:31 +03:00
b8ea90173c Remove 2 old articles - compile-desktop-windows.aspx, compile-desktop-ubuntu.aspx 2022-04-26 13:14:25 +03:00
12658a3f07 Remove old unnecessary virtual guides 2022-04-25 14:38:01 +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
74436c69d6 Remove old duplicates from TipsTricks section, add redirects 2022-04-05 19:11:39 +03:00
b52957a116 Remove old unnecessary general.aspx page 2022-03-31 23:43:47 +03:00
f4f4fc2498 Remove two unnecessary duplicate pages for video support article 2022-03-31 17:12:57 +03:00
98f6aa92ac Remove old duplicates for guides section, add redirects; fix 2 links; Remove unused contols in articlescompletelist 2022-03-31 16:18:11 +03:00
12cbd6c3fc Remove old redirected pages for Control Panel section 2022-03-29 19:21:01 +03:00
093d0781fb Remove old redirected article pages for Installation section; add missing redirects 2022-03-27 13:20:18 +03:00
164aefcc16 Remove old redirected index.aspx pages for Installation section, add some missing redirects 2022-03-25 21:44:11 +03:00
daeb2f6bdc Finish editing local-server.ascx 2022-03-15 14:25:37 +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
5fd7fe58f1 Merge branch 'feature/docs-7.0' into release/1.3.0 2022-01-14 15:24:20 +03:00
f4e5d39bae Remove old articles - add language to Groups (docker, windows) 2021-12-24 12:28:29 +03:00
20a5ae23f3 Hide pro features anew 2021-12-17 17:53:57 +03:00
10f5de0de3 Merge branch 'feature/forms-new' into feature/docs-7.0
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/SavePrintDownload.htm
2021-12-17 13:20:27 +03:00
f0241371ad Move forms to a new branch 2021-12-17 09:45:35 +03:00
481cbd1cd5 Add new and update existing articles for 7.0 2021-12-03 18:18:12 +03:00
ebf4811fe8 targetFramework 4.8
поправлен виртуальный каталог
Поправлен путь к BaseFooter
2021-11-24 18:50:50 +03:00
09463fab27 Added 5.2 Android: updated articles, images, changelog, web.config 2021-09-24 16:14:39 +03:00
4c97d2cadc Add /revision. 2021-06-07 10:21:34 +03:00
aa76eb68d3 Revert "Hidden outdated article - 'Migration to server solution' (this commit can be reverted after updating the text)"
This reverts commit ad07565246.
2021-05-27 15:32:58 +03:00
SvetlanaLisina
493566fbf5 Merge branch 'master' into fearure/bagfix-april 2021-05-11 17:48:48 +03:00
ad07565246 Hidden outdated article - 'Migration to server solution' (this commit can be reverted after updating the text) 2021-04-27 19:03:38 +03:00
66a1249904 Added missing redirect rules, fixed incorrect ones, removed duplicates 2021-04-27 12:22:41 +03:00
2a837f0718 Added redirect for guides/become-affiliate.aspx 2021-04-27 12:10:23 +03:00
SvetlanaLisina
ce0720a44f fixed styles 2021-04-22 17:55:54 +03:00
0360be92a9 Merge branch 'feature/pricing-11.5' into feature/module_11.5 2021-04-11 19:06:47 +03:00
b56f4ba2c8 Fixed Russian symbol in the page name - workspace-saas-change-payment-plan.aspx
# Conflicts:
#	Web/Controls/Help/Guides/General/PayforPortal/PayforPortal.de.ascx
#	Web/Controls/Help/Guides/General/PayforPortal/PayforPortal.es.ascx
#	Web/Controls/Help/Guides/General/PayforPortal/PayforPortal.fr.ascx
#	Web/Controls/Help/Guides/People/AddGuests/AddGuests.de.ascx
#	Web/Controls/Help/Guides/People/AddGuests/AddGuests.es.ascx
#	Web/Controls/Help/Guides/People/AddGuests/AddGuests.fr.ascx
#	Web/Controls/Help/Guides/People/AddGuests/AddGuests.it.ascx
#	Web/Controls/Help/Guides/People/AddGuests/AddGuests.ru.ascx
2021-04-11 19:01:03 +03:00
af644f138e Updated UsingSearch article and several CRM guides, added new page to the User Guides section 2021-04-08 16:13:13 +03:00
5dcbfe977e restore "pages HTTP to HTTPS" enabled="true" 2021-03-26 14:47:57 +03:00
SvetlanaLisina
5de870b5ce redirect removed 2021-03-26 11:17:11 +03:00