Commit Graph

10 Commits

Author SHA1 Message Date
31135de5f0 Fixes for 2 new pages 2022-04-21 13:14:47 +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
54211de98d Structure fix for alibaba articles 2022-04-13 14:12:55 +03:00
4b016334ac Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
541bc4c7f6 Try to fix workspace-saas-change-payment-plan.aspx 2022-03-31 13:12:04 +03:00
ea87e6cecd Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
daeb2f6bdc Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
c7e046ecbc Remove Watchvideo.ascx because of using Resource.resx instead. 2022-03-02 17:06:43 +03:00
1d1d9faad6 Add WebDAV article 2022-02-18 12:47:05 +03:00
50c450362d Rename white-labeling and workspace 2021-11-25 19:03:09 +03:00