helpcenter/Web/Controls/Help/Installation
svetlana maleeva 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
..
Desktop.ascx Partial fixes for desktop-video-support.aspx 2022-03-31 19:19:58 +03:00
Desktop.de.ascx Partial fixes for desktop-video-support.aspx 2022-03-31 19:19:58 +03:00
Desktop.ru.ascx Partial fixes for desktop-video-support.aspx 2022-03-31 19:19:58 +03:00
Docs.ascx Structure fix for alibaba articles 2022-04-13 14:12:55 +03:00
Docs.de.ascx Fix install-univention.ascx tag 2022-03-29 09:50:39 +03:00
Docs.fr.ascx Fix install-univention.ascx tag 2022-03-29 09:50:39 +03:00
Docs.ru.ascx Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
DocsCommunity.ascx Try to fix docs-community-connect-groups-linux.aspx 2022-03-30 16:08:18 +03:00
DocsCommunity.de.ascx Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release 2022-03-21 12:19:07 +03:00
DocsCommunity.fr.ascx Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
DocsCommunity.ru.ascx Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
DocsDeveloper.ascx Structure fix for alibaba articles 2022-04-13 14:12:55 +03:00
DocsDeveloper.de.ascx Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release 2022-03-21 12:19:07 +03:00
DocsDeveloper.fr.ascx Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
DocsDeveloper.ru.ascx Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
DocsEnterprise.ascx Structure fix for alibaba articles 2022-04-13 14:12:55 +03:00
DocsEnterprise.de.ascx Fix install-univention.ascx tag 2022-03-29 09:50:39 +03:00
DocsEnterprise.fr.ascx Fix install-univention.ascx tag 2022-03-29 09:50:39 +03:00
DocsEnterprise.ru.ascx Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
GroupsInstallation.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
GroupsInstallation.de.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
GroupsInstallation.ru.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
Installation.ascx Structure fix for alibaba articles 2022-04-13 14:12:55 +03:00
Installation.de.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
Installation.ru.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
MailInstallation.ascx Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
MailInstallation.de.ascx Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release 2022-03-21 12:19:07 +03:00
MailInstallation.ru.ascx Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
Mobile.ascx Remove Watchvideo.ascx because of using Resource.resx instead. 2022-03-02 17:06:43 +03:00
Mobile.de.ascx Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release 2022-03-21 12:19:07 +03:00
Mobile.ru.ascx Remove Watchvideo.ascx because of using Resource.resx instead. 2022-03-02 17:06:43 +03:00
TalkInstallation.ascx Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
TalkInstallation.de.ascx Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release 2022-03-21 12:19:07 +03:00
TalkInstallation.ru.ascx Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
WorkspaceCommunity.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
WorkspaceCommunity.de.ascx Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release 2022-03-21 12:19:07 +03:00
WorkspaceCommunity.fr.ascx Merge remote-tracking branch 'remotes/origin/feature/fr-installation' into feature/test-merge-for-release 2022-03-18 16:40:41 +03:00
WorkspaceCommunity.ru.ascx Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
WorkspaceEnterprise.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
WorkspaceEnterprise.de.ascx Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release 2022-03-21 12:19:07 +03:00
WorkspaceEnterprise.fr.ascx Merge remote-tracking branch 'remotes/origin/feature/fr-installation' into feature/test-merge-for-release 2022-03-18 16:40:41 +03:00
WorkspaceEnterprise.ru.ascx Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
WorkspaceInstallation.ascx Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-20 16:11:30 +03:00
WorkspaceInstallation.de.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
WorkspaceInstallation.fr.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
WorkspaceInstallation.ru.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
WorkspaceSaas.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
WorkspaceSaas.de.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
WorkspaceSaas.fr.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
WorkspaceSaas.ru.ascx Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00