Commit Graph

3107 Commits

Author SHA1 Message Date
3699c81eb0 Fixes for animations and charts 2022-04-21 17:06:51 +03:00
f17124914d Fixes for animations and charts 2022-04-21 17:05:07 +03:00
6f6bd64fcc Merge branch 'feature/test-merge-for-release' of https://github.com/ONLYOFFICE/helpcenter into feature/test-merge-for-release 2022-04-21 17:03:56 +03:00
57b0cca758 LinuxInstallation (Ubuntu, Debian, derivatives) is translated into German. 2022-04-21 17:02:42 +03:00
fcb3c26f0e Fix hote for flags article 2022-04-21 15:19:49 +03:00
97ad3db83d added ids to the config parameters 2022-04-21 15:07:03 +03:00
f3fca21afc Remove old duplicate page 2022-04-21 14:48:27 +03:00
31135de5f0 Fixes for 2 new pages 2022-04-21 13:14:47 +03:00
b6d215af76 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/Controls/Help/Administration/Administration.de.ascx
#	Web/Controls/Help/Administration/ControlPanel.de.ascx
2022-04-21 09:14:00 +03:00
b7e0c24f3a Fix path 2022-04-20 20:22:21 +03:00
2c8c826eaf Fix side menu for new page 2022-04-20 19:00:34 +03:00
cb1effe260 Merge branch 'feature/build7.1' into feature/build7.1-for-release 2022-04-20 18:34:45 +03:00
d691ecc6d8 Feed tool: main page, header + German. AuthorizationKeys.de.ascx fixes. ControlPanel.de.ascx fixes. 2022-04-20 17:40:51 +03:00
9f538bde0a Fix LinuxRemoveDocs.ascx 2022-04-20 17:39:09 +03:00
ef981fa731 Fix flags and KeyboardShortcuts.htm 2022-04-20 16:53:03 +03:00
4df45fab4a Text fixes for nextcloud-migration.ascx 2022-04-20 16:27:50 +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
3dd2d0d01e Fixes for all editors - DE 2022-04-20 15:05:59 +03:00
0e716b0159 Merge branch 'feature/build7.1' of https://github.com/ONLYOFFICE/helpcenter into feature/build7.1 2022-04-20 14:35:02 +03:00
88ca527798 New iOS features (EN). 2022-04-20 14:34:32 +03:00
b3f06a8240 Update AuthorizationKeys RU - alphabetical order 2022-04-20 11:35:23 +03:00
953b7dffd9 Update 2 branding screens 2022-04-20 11:19:52 +03:00
ce01c6eb09 Fixes for all editors - EN 2022-04-20 11:05:13 +03:00
1cf4614258 Fixes for all editors - EN 2022-04-20 10:56:41 +03:00
d012cf3b93 Fix Jitsi 2022-04-20 10:49:56 +03:00
5d00f8d518 Fix SMTPSettings.ascx - mail.ru 2022-04-19 19:02:46 +03:00
3355783da9 Fix "Our support policy" note 2022-04-19 18:43:07 +03:00
452d669c72 Text fix for Flags.ascx 2022-04-19 18:16:52 +03:00
6d7c109950 Fixes as per testing. 2022-04-19 18:10:42 +03:00
ae340bbd01 Move updated DSRoadmap.ascx from the feature/roadmap_7.1 branch 2022-04-19 18:09:06 +03:00
d2eede8b7f Add Migrating Nextcloud data article 2022-04-19 17:01:32 +03:00
97f05e4c4e CardDAV - new section in People module (EN+DE). 2022-04-19 14:56:03 +03:00
9d579958fc Update smsc instruction - AuthorizationKeys.ascx (en+ru) 2022-04-15 18:38:21 +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
0bf25ba40e Merge remote-tracking branch 'remotes/origin/feature/docs-config-7.1' into feature/build7.1-for-release 2022-04-15 17:34:08 +03:00
e87a59a739 Fixes for new pages 2022-04-15 17:11:52 +03:00
226eeddf1a Merge branch 'feature/build7.1' into feature/build7.1-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-04-15 15:29:03 +03:00
eaccbe7dbe Text fixes for EE FAQs 2022-04-15 14:14:04 +03:00
e66a66dcad AuthorizationKeys rework: alphabetical order, English and German are uniformed. 2022-04-14 15:11:07 +03:00
4229a6272f updated the document config for v7.1 2022-04-14 15:07:49 +03:00
54211de98d Structure fix for alibaba articles 2022-04-13 14:12:55 +03:00
6083b1a4ba Remove unused controls in ArticlesCompleteList 2022-04-13 13:38:54 +03:00
c7ec727baf Text fix for KeyboardShortcuts.htm 2022-04-13 12:22:36 +03:00
076ae0fd2f Rename 176_strapi.ascx in ArticlesCompleteList 2022-04-13 11:26:03 +03:00
1ef0e7dd6f Text fix for desktop-flags.aspx 2022-04-13 11:21:41 +03:00
8538faa640 Remove old unused controls for desktop editors 2022-04-13 10:28:05 +03:00
cb9c65f50a Remove old unused DocumentsDesktop.ascx 2022-04-13 10:20:18 +03:00
1900fd44cf Structure fix for new Strapi article 2022-04-13 10:02:54 +03:00
1bd72dbc15 Merge branch 'feature/strapi_connector' into feature/test-merge-for-release 2022-04-13 09:29:40 +03:00
a410b500e9 Rename images - fix uppercase letters 2022-04-12 20:47:01 +03:00
b1445b6866 Add Galician and Azerbaijani for Docs 2022-04-12 17:05:36 +03:00
5503a47ad7 Remove unused Plugins.htm for SSE 2022-04-12 16:19:40 +03:00
df0b2fa7f1 Remove excess PdfViewer.htm and images for spreadsheet editor 2022-04-12 16:12:49 +03:00
401633b425 Remove excess PdfViewer.htm and images for Presentation Editor 2022-04-12 15:39:04 +03:00
5ca9fffc48 Add aspx pages and menu for new htm pages 2022-04-12 14:49:46 +03:00
516f537fca Fixes for ReportIssues.ascx as per testing. 2022-04-11 16:51:11 +03:00
f39f2f1c17 Initial commit. 2022-04-11 16:27:43 +03:00
7f4fb86363 Add new articles - Installing ONLYOFFICE Docs on Debian systems for ARM 2022-04-11 14:50:59 +03:00
fc9e289ae6 German for a part of new fixes + intermediate (!) for GettingStartedDocuments.de.ascx 2022-04-11 14:34:36 +03:00
60d21c41b2 Text fix for docs-community-update-linux.aspx 2022-04-11 11:50:53 +03:00
d8deca8b3a Fix #24 2022-04-11 10:38:56 +03:00
163ac6156b Text fix for gettingstarted-nuxeo.aspx 2022-04-08 18:52:58 +03:00
a041009a12 Text fix for groups-smtp-settings.aspx 2022-04-08 18:45:26 +03:00
aa6eebf2e2 Text fix for groups-install-docker.aspx 2022-04-08 17:18:54 +03:00
3913802fe3 Text fixes 2022-04-07 16:26:41 +03:00
e7fb15c3ed Fix for mail.aspx in languages 2022-04-07 14:02:14 +03:00
7001fca30b Fix 4304_mob_andr_share_files.ascx 2022-04-07 13:41:36 +03:00
39d4a92158 Fix DocumentEditorTableOfContents.de.ascx 2022-04-06 18:48:05 +03:00
74436c69d6 Remove old duplicates from TipsTricks section, add redirects 2022-04-05 19:11:39 +03:00
dc0845e8c8 Fix for new Moodle video page 2022-04-05 15:48:31 +03:00
28b4ccdcf7 Merge branch 'feature/moodle' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/HelpCenter.ascx
#	Web/Controls/Help/Integration/Integration.ascx
#	Web/Controls/Help/Video/Video.ascx
#	Web/css/help.less
2022-04-05 15:33:55 +03:00
4237756f3d Fix tags for new Jira video page 2022-04-05 14:27:51 +03:00
53aab228eb Merge remote-tracking branch 'remotes/origin/develop' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
#	Web/Controls/Help/Tags/document-server/document-server.ascx
#	Web/Controls/Help/Tags/open-source-version/open-source-version.ascx
2022-04-05 14:09:39 +03:00
72be3bc2b2 Fixes for Nextcloud. 2022-04-05 13:34:35 +03:00
4b016334ac Fix administration/configuration.aspx 2022-04-05 12:57:43 +03:00
f40394df57 Try to fix groups-guides-documents-collaborative-editing.aspx 2022-04-04 16:59:50 +03:00
4da7d887ff Fix insert-objects.ascx for desktop-video-support.aspx 2022-04-04 11:41:57 +03:00
ae3f242ba2 Remove unused /Cloud/General.ascx controls 2022-04-01 00:08:30 +03:00
b52957a116 Remove old unnecessary general.aspx page 2022-03-31 23:43:47 +03:00
2b2f3aa01b Remove unused HostingPageButtons.ascx 2022-03-31 23:07:56 +03:00
833c81300e Fix CloudPageButtons.ascx 2022-03-31 22:50:41 +03:00
c4f55eb453 Partial fixes for desktop-video-support.aspx 2022-03-31 19:19:58 +03:00
f4f4fc2498 Remove two unnecessary duplicate pages for video support article 2022-03-31 17:12:57 +03:00
612925a715 Fix for groups-gettingstarted-projects.aspx 2022-03-31 16:53:57 +03:00
719c8909a4 Fix for workspace-saas-change-payment-plan.aspx 2022-03-31 16:27:16 +03:00
98f6aa92ac Remove old duplicates for guides section, add redirects; fix 2 links; Remove unused contols in articlescompletelist 2022-03-31 16:18:11 +03:00
ed2d376f47 Fixes for Moodle.ascx EN. 2022-03-31 15:31:00 +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
9434a22fa3 Fix for docs-enterprise-install-univention.aspx 2022-03-31 10:38:33 +03:00
fe9f9d0628 Fixes for docs-community-add-themes-windows.aspx 2022-03-31 10:16:37 +03:00
f46a66a3a9 Fixes for Docs system requirements 2022-03-31 10:05:15 +03:00
6eed475f91 Fixes for docs-community-connect-groups-linux.aspx 2022-03-31 09:18:19 +03:00
6583397eb4 Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
b7b72d9210 Remove several redirected pages 2022-03-30 16:26:49 +03:00
4f53d682cf Try to fix docs-community-connect-groups-linux.aspx 2022-03-30 16:08:18 +03:00
2d6d061d30 Remove duplicated control for ldap article, remove redirected sso page 2022-03-30 12:50:44 +03:00
12cbd6c3fc Remove old redirected pages for Control Panel section 2022-03-29 19:21:01 +03:00
60f121b540 Try to fix administration/control-panel-ldap.aspx 2022-03-29 17:25:47 +03:00
3f66cc309f Try to fix groups-update-docker.aspx 2022-03-29 14:53:04 +03:00
92d80d9919 Try to fix 3 tags 2022-03-29 13:40:15 +03:00
caf606fbd4 Fix install-univention.ascx tag 2022-03-29 09:50:39 +03:00
de81884ff8 Fix windows-version.ascx tag 2022-03-28 23:16:19 +03:00
7b414e123a Fix linux-version.ascx tag 2022-03-28 22:08:34 +03:00
d7fbb6a425 Fix ConnectMailToCommunityOnWindows.de.ascx 2022-03-28 21:07:35 +03:00
c59a07fb60 Add Integrate Moodle video 2022-03-28 17:18:49 +03:00
cd415227b0 Fixes as per build 7.1 (for reworked collaborative editing section) 2022-03-28 16:59:46 +03:00
02a4c0c758 German: Fixes for SSE, updated screenshots for all editors 2022-03-28 15:42:12 +03:00
2b664ae146 Update images/convertequation.png - SSE, PE (en, ru, fr) 2022-03-28 12:06:38 +03:00
e0a10db293 Update images/convertequation.png - SSE, PE (en, ru, fr) 2022-03-28 12:04:52 +03:00
093d0781fb Remove old redirected article pages for Installation section; add missing redirects 2022-03-27 13:20:18 +03:00
164aefcc16 Remove old redirected index.aspx pages for Installation section, add some missing redirects 2022-03-25 21:44:11 +03:00
1821f1fda3 Merge branch 'feature/test-merge-for-release-v2' into feature/test-merge-for-release
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
2022-03-25 19:59:08 +03:00
a45d2ea0ac Fix InsertEquation.htm - SSE, PE (en, ru, fr) 2022-03-25 18:13:31 +03:00
bc1eea0d07 Fix InsertEquation.htm - SSE, PE (en, ru, fr) 2022-03-25 17:45:55 +03:00
94c40d8b70 Merge branch 'feature/test-merge-for-release-v3' into feature/test-merge-for-release-v2
# Conflicts:
#	Web/App_GlobalResources/Resource.fr.resx
2022-03-25 16:43:05 +03:00
abd9e76396 Fixes for groups-gettingstarted-projects.aspx - Part 2 2022-03-25 14:13:39 +03:00
5d45e84491 Add Jira video, update video thumbnails 2022-03-24 18:27:51 +03:00
b13d372cb2 PE fixes in German 2022-03-24 18:20:20 +03:00
493a37aa6d DE fixes in German 2022-03-24 18:19:40 +03:00
e498c6be28 Add folders to Favorites 2022-03-24 17:17:30 +03:00
815a2293b3 Update translations (FR) 2022-03-24 10:46:28 +03:00
975f106645 Fixes for DE, PE, SSE (EN) 2022-03-24 10:32:24 +03:00
11539f099b Fixes for groups-gettingstarted-projects.aspx Part 1 2022-03-24 09:59:42 +03:00
908e7a5a02 Remove old redirected pages for user guides section 2022-03-23 10:11:37 +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
fcb12d0813 Some fixes in .fr controls for mobile apps 2022-03-18 15:20:44 +03:00
db7e011d96 Merge remote-tracking branch 'remotes/origin/feature/fr-translations-android' into feature/test-merge-for-release 2022-03-18 15:08:53 +03:00
d789834b54 Merge remote-tracking branch 'remotes/origin/feature/german_integration_fixes' into feature/test-merge-for-release 2022-03-18 14:11:57 +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
64c3cab27f Fix paths for new docs-community-remove-linux.aspx 2022-03-18 14:04:03 +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
d1abed7d2b Merge remote-tracking branch 'remotes/origin/feature/connectors-jwt' into feature/test-merge-for-release 2022-03-18 13:31:33 +03:00
a102fff4fc Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/custom-domain-name/custom-domain-name.ascx
#	Web/Controls/Help/Tags/invite-people/invite-people.ascx
#	Web/Controls/Help/Tags/password-strength/password-strength.ascx
#	Web/Controls/Help/Tags/restore-backup/restore-backup.ascx
#	Web/Controls/Help/Tags/security/security.ascx
#	Web/Controls/Help/Tags/trusted-domains/trusted-domains.ascx
2022-03-18 13:30:18 +03:00
6bd68bb22b Edit Flatpak translations 2022-03-18 12:34:54 +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
d2aa901864 Fix watchvideo_block for new Personal page 2022-03-17 16:21:11 +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
0638b85e88 Merge remote-tracking branch 'remotes/origin/feature/adfs' into feature/test-merge-for-release 2022-03-17 15:53:08 +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
3f588d2896 Merge remote-tracking branch 'remotes/origin/feature/roadmap_7.1' into feature/test-merge-for-release 2022-03-17 15:27:09 +03:00
52ffe548df Merge remote-tracking branch 'remotes/origin/feature/desktop7.0.1' into feature/test-merge-for-release 2022-03-17 15:23:50 +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
c98776746d Merge remote-tracking branch 'remotes/origin/feature/contribute_reportissues' into feature/test-merge-for-release 2022-03-17 14:51:41 +03:00
7a0c67696b Fix watchvideo_block for new Redmine video 2022-03-17 14:38:35 +03:00
85e9044c71 Fix paths for new Redmine video page 2022-03-17 14:19:26 +03:00
4ca6cbee11 Merge remote-tracking branch 'remotes/origin/feature/smtp' into feature/test-merge-for-release 2022-03-17 13:51:41 +03:00
3997a86511 Merge remote-tracking branch 'remotes/origin/feature/troubleshooting-mail' into feature/test-merge-for-release 2022-03-17 13:41:57 +03:00
2075836579 Merge remote-tracking branch 'remotes/origin/feature/add-note' into feature/test-merge-for-release 2022-03-17 13:35:34 +03:00
3df1d45437 Merge remote-tracking branch 'remotes/origin/feature/docs-desktop-fixes' into feature/test-merge-for-release 2022-03-17 13:25:25 +03:00
ac97b28cf3 Merge branch 'feature/test-3-branches-further-changes' into feature/test-merge-for-release 2022-03-17 13:10:38 +03:00
292c8eb2e4 Fix -v /sys/fs/cgroup:/sys/fs/cgroup:rw 2022-03-17 11:10:08 +03:00
56549aa116 Fix 2 commands for DockerInstallation.ascx 2022-03-16 18:58:17 +03:00
fb344b575d Fix supported devices for iOS 2022-03-16 18:20:56 +03:00
ea87e6cecd Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
79f2b60840 Add mail read notification 2022-03-16 16:21:02 +03:00
fed4064039 Minor fixes for PE and DE (EN). 2022-03-16 13:08:05 +03:00
daeb2f6bdc Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
9da361bfb4 Fixes and new features (EN+FR) 2022-03-15 13:09:54 +03:00
52a19404f2 GettingStarted-DocsModule - version 1. 2022-03-15 12:34:19 +03:00
c6e97e7ee2 Merge branch 'feature/helpcenter_12.0' of https://github.com/ONLYOFFICE/helpcenter into feature/helpcenter_12.0 2022-03-10 18:07:17 +03:00
e88968f0ec Rework: Collaboration section (SSE, PE). 2022-03-10 18:05:09 +03:00
2f1ac5ec73 Add Project module changes, Active connections article. Update screenshots and tags 2022-03-09 18:24:41 +03:00
55933ce0c2 Beginning of optimization of local-server.ascx. 2022-03-09 17:42:50 +03:00
04ad07da3e Restore missing CommonOpersForAndr in Resource.resx
Some changes for /installation/mail-connect-groups-windows.aspx
Remove redirected page server/docker/mail/connect-mail-server-to-community-server-on-windows.aspx
Update 2 commands in .ru controls
2022-03-09 13:10:10 +03:00
6fd6fc964b Some changes on / mail-connect-groups-windows.aspx editing. 2022-03-05 16:36:23 +03:00
95b1317b42 Rework of the 'Sharing text documents' article -> 'Sharing files and folders'. 2022-03-05 16:21:23 +03:00
f546705136 Fixes. 2022-03-05 11:29:01 +03:00
9e1b221ee7 Merge branch 'feature/helpcenter_12.0' of https://github.com/ONLYOFFICE/helpcenter into feature/helpcenter_12.0 2022-03-03 13:32:02 +03:00
d399150766 Reworked OO Docs indexes in EN, DE, ES, IT, FR; changed screenshots as per build 12.0; fixed ChangingSettings (auto Trash bin). 2022-03-03 13:31:08 +03:00
9209fac24c Revert 15b380b10d and fixes for /userguides/mobile-android.aspx. 2022-03-03 00:46:50 +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
393bea7e2d Remove ComOpersAndr.ascx because of using Resource.resx instead. 2022-03-02 16:55:24 +03:00
9ce6c28f78 Use Resource.resx on /administration/portal-management.aspx for testing (page was worked). 2022-03-02 16:29:13 +03:00
15b380b10d Temporary comment huge localized block on /userguides/mobile-android.aspx for testing. 2022-03-02 16:11:11 +03:00
2c9bf74e9c Try to fix /userguides/mobile-android.aspx by using Resource.resx + changes for another pages with adding controls. 2022-03-02 16:10:08 +03:00
4c51d4e864 Update PrivateRoom.ascx - add note 2022-03-02 11:28:57 +03:00
2e8a5aa4ec Update Configuration.ascx: DNS settings, restore missing section, remove unused text 2022-03-01 16:44:57 +03:00
e202c96c03 Update white labeling 2022-03-01 12:42:57 +03:00
90ca22aade Escape from LocalizeContent for /userguides/mobile-android.aspx. 2022-02-28 15:42:06 +03:00
f2c09584fa Cut paths for /userguides/mobile-android.aspx (p2) + escape from LocalizeContent for videos. 2022-02-28 15:07:40 +03:00
7983f05964 Cut paths for /userguides/mobile-android.aspx (p1). 2022-02-28 14:49:15 +03:00
46ce782f57 Try to fix Build errors. 2022-02-25 20:55:59 +03:00
38a9bca017 Add controls for d57fe219ea. 2022-02-25 20:54:39 +03:00
9a0398cf43 Add videos: Integrate Redmine, Fillable forms 2022-02-25 19:25:59 +03:00
42dada0be0 Try to fix 500 error on test-helpcenter.onlyoffice.com/installation/desktop-install-flatpak.aspx. Remove redirected /desktop/documents/linux/installation-flatpak.aspx. 2022-02-25 18:26:51 +03:00
a138c11949 Control structure optimization of /installation/desktop-sys-reqs-macos.aspx. 2022-02-25 18:23:20 +03:00
703a59651e Lost from f2111c52a4. 2022-02-25 17:21:28 +03:00
d57fe219ea Add controls without LocalizeContent on /installation/desktop-sys-reqs-*.aspx pages. 2022-02-25 17:14:24 +03:00
f2111c52a4 Edit inner control srtucture of /installation/desktop-sys-reqs-*.aspx pages. 2022-02-25 17:06:56 +03:00
c8b2ff8186 Updates: Community disabled; Birthdays moved to People 2022-02-24 16:25:12 +03:00
390024dbc7 Add Removing ONLYOFFICE Docs for Linux article 2022-02-22 17:02:15 +03:00
c2db1a62ac Update AuthorizationKeys.ascx - Twilio, fixes 2022-02-22 14:27:58 +03:00
d2959353b7 Update AuthorizationKeys.ascx - Apple, MS, bitly 2022-02-22 11:19:15 +03:00
40e08b5711 Add new JWT step for connectors 2022-02-18 18:09:16 +03:00