Commit Graph

120 Commits

Author SHA1 Message Date
1495c73972 Fix for ConnectAWS.ascx 2022-05-05 13:53:48 +03:00
120fd88458 Add docs-connect-amazon.aspx 2022-04-29 15:45:54 +03:00
e7375bd37e Remove 'How to install Desktop Editors to Arch' article 2022-04-25 18:35:05 +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
c4f55eb453 Partial fixes for desktop-video-support.aspx 2022-03-31 19:19:58 +03:00
541bc4c7f6 Try to fix workspace-saas-change-payment-plan.aspx 2022-03-31 13:12:04 +03:00
4f53d682cf Try to fix docs-community-connect-groups-linux.aspx 2022-03-30 16:08:18 +03:00
caf606fbd4 Fix install-univention.ascx tag 2022-03-29 09:50:39 +03:00
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
a878943fa2 Merge remote-tracking branch 'remotes/origin/feature/fr-installation' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/ArticlesCompleteList/Enterprise/110001_configure_enterprise.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/Enterprise/110002_renew_subscription.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/Enterprise/110007_switch_https_enterprise_package.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/Enterprise/110008_import_mail_from_exchange.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/Enterprise/110009_switch_https_enterprise_windows_script.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerDocker/70034_enterprise_script_parameters.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerDocker/70035_opensource_script_parameters.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerDocker/70046_install_docker_integrated_document.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerDocker/70054_deploy_community_in_digitalocean.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerDocker/70057_community_installation_compose.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerLinux/60033_enterprise_script_RPM_DEB.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerLinux/60034_opensource_script_RPM_DEB.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerLinux/60037_EE_AMI.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerWindows/50012_enterprise.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerWindows/50016_install_community_edition.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/ServerWindows/50026_enterprise_windows_upgrade.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/Vultr/0002_workspace.fr.ascx
2022-03-18 16:40:41 +03:00
d312b78813 Merge remote-tracking branch 'remotes/origin/feature/desktop-arch' into feature/test-merge-for-release 2022-03-18 14:06:50 +03:00
2f6656df24 Merge remote-tracking branch 'remotes/origin/feature/remove-docs-ubuntu' into feature/test-merge-for-release 2022-03-18 13:55:12 +03:00
76ff835471 Merge remote-tracking branch 'remotes/origin/feature/desktop_installation_guides' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Desktop/Documents/Linux/DeskLinInstFp/DesktopLinuxInstallFlatpak.de.ascx
2022-03-17 17:19:30 +03:00
e75ba847d4 Merge remote-tracking branch 'remotes/origin/feature/one-click-install' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Installation/Docs.ascx
#	Web/Controls/Help/Installation/DocsCommunity.ascx
#	Web/Controls/Help/Installation/DocsDeveloper.ascx
#	Web/Controls/Help/Installation/DocsEnterprise.ascx
#	Web/Controls/Help/Installation/Installation.ascx
2022-03-17 15:50:35 +03:00
f83f70f1a1 Merge remote-tracking branch 'remotes/origin/feature/alibaba-cloud' into feature/test-merge-for-release 2022-03-17 15:13:40 +03:00
c2cd1c154a Merge remote-tracking branch 'remotes/origin/feature/desktop-flags' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/desktop-editors/desktop-editors.ascx
2022-03-17 15:05:25 +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
cf268bf695 Remove HideContents.ascx because of using Resource.resx instead. 2022-03-02 17:42:41 +03:00
6695862877 New article - How to install Desktop Editors to Arch 2022-03-02 17:42:22 +03:00
c7df67bf43 Remove ShowContents.ascx because of using Resource.resx instead. 2022-03-02 17:32:08 +03:00
c7e046ecbc Remove Watchvideo.ascx because of using Resource.resx instead. 2022-03-02 17:06:43 +03:00
390024dbc7 Add Removing ONLYOFFICE Docs for Linux article 2022-02-22 17:02:15 +03:00
fce076c3f6 Add translations (fr) - Installation - Workspace 2022-02-18 10:14:52 +03:00
e8aa8f7254 Fix conflict resolution for da6a928aa6. 2022-02-11 18:11:34 +03:00
da6a928aa6 Merge remote-tracking branch 'remotes/origin/feature/docs-config' into feature/test-prerelease-1.4.0
# Conflicts:
#	Web/Controls/Help/Installation/DocsDeveloper.ascx
2022-02-11 14:47:26 +03:00
7e37302e24 Minor fixes (indexes, pop-ups, translation pop-up). 2022-02-11 13:23:44 +03:00
ddd288d92d Add 5 new videos, update tags; minor fixes 2022-02-08 14:42:14 +03:00
67963d2213 German installation guides completed. 2022-02-04 18:00:41 +03:00
226c3abd15 Add info about Updating with script, add 1-click install section to index pages 2022-02-04 11:11:35 +03:00
9b17733806 German translation including index page (full). 2022-02-03 01:19:08 +03:00
290dc3d6b8 Add Alibaba Cloud articles; update Amazon, Vultr, DigitalOcean Docs articles; update Workspace version 2022-01-28 18:38:36 +03:00
beb5b46a75 Merge branch 'develop' into feature/desktop_installation_guides 2022-01-26 14:20:50 +03:00
88f9ae039a Translation for OO Talk, and Docs CE (partially). 2022-01-25 19:56:43 +03:00
092350cd2c Merge branch 'develop' into feature/desktop-flags 2022-01-25 11:34:31 +03:00
3c1751bdd6 OO Mail completed. 2022-01-19 21:16:24 +03:00
053b36e95e OO Groups completed. 2022-01-18 19:03:18 +03:00
c62e364761 Merge branch 'feature/desktop7.0' into release/1.3.0 2022-01-14 15:24:46 +03:00
5fd7fe58f1 Merge branch 'feature/docs-7.0' into release/1.3.0 2022-01-14 15:24:20 +03:00
26ccf43924 Minor fix in menu 2022-01-13 16:53:49 +03:00
87e44f03f2 Add ONLYOFFICE Docs EE on Cloudron; Minor Installation section menu adjustments; Change step 3 for Cloudron article
# Conflicts:
#	Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
2022-01-13 16:21:18 +03:00
a51e5d3d83 Added DocsCloudron article to Installation.aspx page
(cherry picked from commit 662ed17573)
2022-01-13 16:13:04 +03:00
2f05179d68 Added Install Docs on Cloudron article, cloudron tag
# Conflicts:
#	Web/Controls/Help/GettingStarted/Integration/Confluence/Confluence.ascx
#	Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
2022-01-13 16:12:44 +03:00
48b5ce85e4 added description of Docs config 2022-01-13 14:59:20 +03:00
e562d15449 Update Docker Compose article for CE, add new article for DE 2021-12-24 17:38:21 +03:00
f4e5d39bae Remove old articles - add language to Groups (docker, windows) 2021-12-24 12:28:29 +03:00
ee6d90eb1a Update desktop editors articles 2021-12-24 11:26:04 +03:00
20a5ae23f3 Hide pro features anew 2021-12-17 17:53:57 +03:00
b246e90550 Updated screenshots, alphabetized index for Linux-based systems. 2021-12-13 19:13:40 +03:00