svetlana maleeva c52dc2ad83 Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release ... # Conflicts: # Web/Controls/Help/ArticlesCompleteList/DeveloperEdition/150001_linux_installation.de.ascx # Web/Controls/Help/ArticlesCompleteList/DeveloperEdition/150009_third_party_domains.de.ascx # Web/Controls/Help/ArticlesCompleteList/DeveloperEdition/150010_de_AMI.de.ascx # Web/Controls/Help/ArticlesCompleteList/DeveloperEdition/150016_docs_de_script.de.ascx # Web/Controls/Help/ArticlesCompleteList/DigitalOcean/001_deploydocs.de.ascx # Web/Controls/Help/ArticlesCompleteList/DocsEnterprise/190000_install_docs_ee_windows.de.ascx # Web/Controls/Help/ArticlesCompleteList/DocsEnterprise/190002_install_docs_ee_ubuntu.de.ascx # Web/Controls/Help/ArticlesCompleteList/DocsEnterprise/190003_install_docs_ee_centos.de.ascx # Web/Controls/Help/ArticlesCompleteList/DocsEnterprise/190005_third_party_domains.de.ascx # Web/Controls/Help/ArticlesCompleteList/DocsEnterprise/190006_EE_AMI.de.ascx # Web/Controls/Help/ArticlesCompleteList/DocsEnterprise/190007_switch_to_https.de.ascx # Web/Controls/Help/ArticlesCompleteList/DocsEnterprise/190014_docs_ee_script.de.ascx # Web/Controls/Help/ArticlesCompleteList/Enterprise/110007_switch_https_enterprise_package.de.ascx # Web/Controls/Help/ArticlesCompleteList/Enterprise/110008_import_mail_from_exchange.de.ascx # Web/Controls/Help/ArticlesCompleteList/Enterprise/110009_switch_https_enterprise_windows_script.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70002_community_installation.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70004_mail_installation.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70010_migrate_from_linux.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70011_community_remove.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70013_mail_remove.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70014_use_mysql.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70015_use_https.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70017_additional_ports.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70021_migrate_to_linux.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70030_mail_server_upgrade.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70031_document_server_docker_compose.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70032_connect_mail_community_windows.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70033_connect_mail_community_linux.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70034_enterprise_script_parameters.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70035_opensource_script_parameters.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70036_connect_mail_community_portal_settings.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70044_add_language_document_server.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70046_install_docker_integrated_document.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70047_install_docker_integrated_mail.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70048_change_domain_mail_server.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70049_run_external_script.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70050_create_mailboxes_using_script.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70051_change_passwords_using_script.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70052_synchronize_mailboxes_using_script.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70053_server_behind_nat.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70054_deploy_community_in_digitalocean.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70057_community_installation_compose.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70058_docs_ce_script.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60002_community_installation.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60003_documents_installation.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60008_connect_community_to_document.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60009_switch_to_https.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60010_switch_to_https_document.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60011_install_fonts_linux.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60020_network_settings.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60024_documents_installation_centos.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60028_documents_proxy.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60029_switch_talk_to_tls.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60030_community_installation_rpm.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60031_add_language_document_server.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60033_enterprise_script_RPM_DEB.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60034_opensource_script_RPM_DEB.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60035_add_themes_linux.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60036_documents_installation_snap.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60037_EE_AMI.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50003_migrate_to_linux.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50004_install_fonts.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50006_connect_community_to_document.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50007_switch_to_https.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50008_compile_source_code.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50011_remove_fonts.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50012_enterprise.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50016_install_community_edition.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50019_switch_talk_to_tls.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50021_community_custom_modules.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50022_community_create_api.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50023_connect_webdav_ubuntu.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50024_connect_webdav_windows.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50026_enterprise_windows_upgrade.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50027_add_themes_windows.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50030_uninstall_plugins.de.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50031_add_plugins.de.ascx # Web/Controls/Help/ArticlesCompleteList/Vultr/0001_deploydocs.de.ascx # Web/Controls/Help/ArticlesCompleteList/Vultr/0002_workspace.de.ascx # Web/Controls/Help/Desktop/Documents/Common/PrivateRoom/PrivateRoom.de.ascx # Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/PresentationEditor/VideoSupport/video-support.de.ascx # Web/Controls/Help/Tags/upgrade-server/upgrade-server.de.ascx		2022-03-21 12:19:07 +03:00
..
ABCIndex	Edit other controls for installation/mail-connect-groups-windows.aspx	2022-03-16 17:44:14 +03:00
Administration	Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release	2022-03-18 13:30:18 +03:00
AdministratorGuides	Merge remote-tracking branch 'remotes/origin/feature/fr-installation' into feature/test-merge-for-release	2022-03-18 16:40:41 +03:00
ArticlesCompleteList	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
Calendar	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
CloseContainer
Cloud
Community	Rename controls	2022-02-15 17:04:43 +03:00
CRM	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
Desktop/Documents	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
Documents	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
FAQ	Update Developer Edition faq	2022-02-07 13:40:43 +03:00
GettingStarted	Merge remote-tracking branch 'remotes/origin/feature/german_integration_fixes' into feature/test-merge-for-release	2022-03-18 14:11:57 +03:00
Glossary
Guides	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
Installation	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
Integration	Merge remote-tracking branch 'remotes/origin/feature/german_integration_fixes' into feature/test-merge-for-release	2022-03-18 14:11:57 +03:00
Mail	Фикс прекомпиляции хелпцентра	2021-11-24 19:02:19 +03:00
MobApps	Some fixes in .fr controls for mobile apps	2022-03-18 15:20:44 +03:00
Modules_Settings	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
ONLYOFFICEEditors	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
PDFHowTo
People	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
Projects	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
Promo
ScreenHelp
Server	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
SideMenu	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
SiteMap	Edit other controls for installation/mail-connect-groups-windows.aspx	2022-03-16 17:44:14 +03:00
SocialLinks
Tags	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
Talk	Remove Watchvideo.ascx because of using Resource.resx instead.	2022-03-02 17:06:43 +03:00
TextContainer
TipsTricks	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
Troubleshooting	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
UserGuides	Fix watchvideo_block for new Personal page	2022-03-17 16:21:11 +03:00
VariousControls	Merge remote-tracking branch 'remotes/origin/feature/alibaba-cloud' into feature/test-merge-for-release	2022-03-17 15:13:40 +03:00
Video	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
Webinars
HelpCenter.ascx	Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release	2022-03-17 16:04:18 +03:00
HelpCenter.de.ascx	Fixes in translations and menus	2022-01-17 13:03:09 +03:00
HelpCenter.es.ascx	Updated other faq links in languages	2021-06-09 18:14:39 +03:00
HelpCenter.fr.ascx	Add links in languages, fixes	2021-12-02 12:09:53 +03:00
HelpCenter.it.ascx	Updated other faq links in languages	2021-06-09 18:14:39 +03:00
HelpCenter.ru.ascx	Edited helpcenter main page.	2021-09-07 17:14:16 +03:00
HelpSidebarForm.ascx
Search.ascx
Search.de.ascx
Search.es.ascx
Search.fr.ascx
Search.it.ascx
Search.ru.ascx