Commit Graph

147 Commits

Author SHA1 Message Date
3d419cbc27 Update sorting for Personal 2022-05-11 16:09:21 +03:00
882e4db947 Minor text fix 2022-05-07 11:44:02 +03:00
bb836fd357 Fix ReportTypes.ascx EN 2022-05-06 19:10:02 +03:00
d8d049b82f Fixes to GSMail, GSProjects, ReportTypes, ActiveConnections articles 2022-05-06 15:26:49 +03:00
723573da74 Minor fix for ShareDocuments. 2022-05-05 15:40:02 +03:00
91adee86e6 Fixes as per testing; new German translations. 2022-05-05 14:00:21 +03:00
7549e5478b Fixes as per testing in EN and DE. 2022-04-28 12:38:59 +03:00
4bea379412 Fixed links for TOC in ShareDocuments. 2022-04-26 16:58:42 +03:00
26b7ce1020 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/web.config
2022-04-26 16:38:08 +03:00
d61e938711 Deleted two unused articles, set redirect. 2022-04-26 14:53:31 +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
9fedee2516 Fixes, translations, screenshots for German version. OO Groups Documents module page is reworked in English. 2022-04-15 18:19:11 +03:00
516f537fca Fixes for ReportIssues.ascx as per testing. 2022-04-11 16:51:11 +03:00
f40394df57 Try to fix groups-guides-documents-collaborative-editing.aspx 2022-04-04 16:59:50 +03:00
38fce07750 Sharing_Docs module rework. 2022-03-31 15:12:36 +03:00
541bc4c7f6 Try to fix workspace-saas-change-payment-plan.aspx 2022-03-31 13:12:04 +03:00
60f121b540 Try to fix administration/control-panel-ldap.aspx 2022-03-29 17:25:47 +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
dfb9965ae6 Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
2022-03-17 16:04:18 +03:00
c98776746d Merge remote-tracking branch 'remotes/origin/feature/contribute_reportissues' into feature/test-merge-for-release 2022-03-17 14:51:41 +03:00
2f1ac5ec73 Add Project module changes, Active connections article. Update screenshots and tags 2022-03-09 18:24:41 +03:00
95b1317b42 Rework of the 'Sharing text documents' article -> 'Sharing files and folders'. 2022-03-05 16:21:23 +03:00
fce076c3f6 Add translations (fr) - Installation - Workspace 2022-02-18 10:14:52 +03:00
9806e697fa Rename controls 2022-02-15 17:04:43 +03:00
46771c89f0 Correct mistakes and additions to the text, update available language table 2022-02-01 18:01:23 +03:00
dc9a9bfd94 Add ONLYOFFICE Personal section 2022-02-01 13:52:38 +03:00
de2fded0ad Fixed as per testing. 2022-01-25 20:01:16 +03:00
053b36e95e OO Groups completed. 2022-01-18 19:03:18 +03:00
80ec997a5f Merge branch 'feature/workspace-11.6' into release/1.3.0
# Conflicts:
#	Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx
#	Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.de.ascx
2022-01-14 15:35:08 +03:00
90431eccd2 New article: Reporting issues. 2022-01-12 17:24:03 +03:00
7ab9102495 German for build 11.6. 2022-01-11 18:24:15 +03:00
ffb0ddaefa Rename guide156 to guide158 2021-12-24 16:19:50 +03:00
ae4f7bb6e2 Fix form guides 2021-12-15 13:04:21 +03:00
f7bdfa68ae Update info about filling in forms 2021-12-14 14:11:04 +03:00
218eb5a88d Update 'Translating ONLYOFFICE' document link 2021-12-10 15:24:07 +03:00
0cd13edae8 Rename Master form to Form template, some fixes 2021-12-03 14:14:35 +03:00
2a7ff597e7 Update articles 2021-11-30 14:54:58 +03:00
1d8deb3700 Updates and fixes 2021-11-29 16:38:40 +03:00
3a18b02881 Update ShareDocuments.ascx 2021-11-23 16:47:04 +03:00
2f1e1318c2 Added new translations - fr 2021-10-14 12:09:40 +03:00
6ecae157a6 Updated translations (fr) - Community, CRM 2021-10-11 12:42:23 +03:00
8562b896fe Merge branch 'feature/administration_guides' into release/1.0.0 2021-10-07 19:05:02 +03:00
6813228e0b Fix h2 for ShareDocuments.fr.ascx 2021-10-06 15:43:16 +03:00
056d26fbd6 Docs and General articles (without updating screenshots) 2021-10-06 15:18:32 +03:00
6a7bf6551f Initial commit. 2021-10-05 16:13:07 +03:00
4a888e3ae7 Minor text fix, update Changelog.md 2021-09-20 15:24:57 +03:00
a5803be2f9 Minor fixes for GanttChart.de.ascx 2021-08-20 18:09:31 +03:00
617f2b6333 Merge remote-tracking branch 'remotes/origin/feature/unused-server-controls' 2021-06-17 17:59:35 +03:00
c725b012eb Removed affiliates page+controls 2021-06-17 16:27:56 +03:00