helpcenter/Web/Controls/Help/Installation
svetlana maleeva 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
..
Desktop.ascx Remove 'How to install Desktop Editors to Arch' article 2022-04-25 18:35:05 +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 Merge branch 'feature/build7.1-for-release' into release/1.4.0 2022-05-09 15:22:16 +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 Merge branch 'feature/build7.1-for-release' into release/1.4.0 2022-05-09 15:22:16 +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 Merge branch 'feature/build7.1-for-release' into release/1.4.0 2022-05-09 15:22:16 +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 Merge branch 'feature/build7.1-for-release' into release/1.4.0 2022-05-09 15:22:16 +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 Merge branch 'feature/build7.1-for-release' into release/1.4.0 2022-05-09 15:22:16 +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 Fixes for 2 new pages 2022-04-21 13:14:47 +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 Fixes for 2 new pages 2022-04-21 13:14:47 +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 Fixes for 2 new pages 2022-04-21 13:14:47 +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