|
|
e8ebbdb845
|
Build 7.2: Fixes as per testing.
|
2022-09-20 18:12:28 +03:00 |
|
|
|
aae3b54e38
|
edit fr
|
2022-09-14 16:05:51 +03:00 |
|
|
|
08c8450d97
|
Merge branch 'feature/web-apps-help' of https://github.com/ONLYOFFICE/helpcenter into feature/web-apps-help
|
2022-09-13 18:28:07 +03:00 |
|
|
|
91b1646cf9
|
edit fr
|
2022-09-13 18:27:29 +03:00 |
|
|
|
123f2e73ca
|
Add Ru translation to Configuring JWT article, update tags, minor fixes
|
2022-09-13 18:14:17 +03:00 |
|
|
|
c5ab0490c2
|
Build 7.2: fixes for iOS Documents, minor fixes for editors, JWT as a standalone article (EN+DE).
|
2022-08-29 18:23:09 +03:00 |
|
|
|
51607baf68
|
Fix links for Installation pages
|
2022-08-09 13:53:21 +03:00 |
|
|
|
e6a632186d
|
Merge branch 'feature/translations-fr-new' into release/1.6.0
# Conflicts:
# Web/AdministratorGuides/Mass-mailing.aspx
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.es.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/App_GlobalResources/Resource.it.resx
# Web/App_GlobalResources/Resource.resx
# Web/App_GlobalResources/Resource.ru.resx
# Web/Controls/Help/ArticlesCompleteList/DeveloperEdition/150017_change_themes_de.de.ascx
# Web/Controls/Help/Installation/Desktop.de.ascx
# Web/Controls/Help/Installation/Installation.ascx
# Web/Controls/Help/Installation/Installation.de.ascx
# Web/Controls/Help/MobApps/MobileProjects/MobileProjects.ascx
# Web/Controls/Help/MobApps/MobileProjects/MobileProjects.de.ascx
# Web/Controls/Help/MobApps/MobileProjects/MobileProjects.es.ascx
# Web/Controls/Help/MobApps/MobileProjects/MobileProjects.fr.ascx
# Web/Controls/Help/MobApps/MobileProjects/MobileProjects.ru.ascx
# Web/Controls/Help/Tags/add-event/add-event.de.ascx
# Web/Controls/Help/Tags/change-color/change-color.ascx
# Web/Controls/Help/Tags/change-color/change-color.de.ascx
# Web/Controls/Help/Tags/change-color/change-color.es.ascx
# Web/Controls/Help/Tags/create-event/create-event.de.ascx
# Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ascx
# Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.de.ascx
# Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.es.ascx
# Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.fr.ascx
# Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.it.ascx
# Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ru.ascx
# Web/Controls/Help/UserGuides/DocsGuides.de.ascx
# Web/Controls/Help/UserGuides/DocsGuides.fr.ascx
# Web/Controls/Help/UserGuides/DocsGuides.ru.ascx
# Web/Controls/Help/UserGuides/DocsSE.ascx
# Web/Controls/Help/UserGuides/DocsSE.de.ascx
# Web/Controls/Help/UserGuides/DocsSE.fr.ascx
# Web/Controls/Help/UserGuides/DocsSE.it.ascx
# Web/Controls/Help/UserGuides/DocsSE.ru.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/GroupsDocuments.ascx
# Web/Controls/Help/UserGuides/GroupsDocuments.de.ascx
# Web/Controls/Help/UserGuides/GroupsDocuments.fr.ascx
# Web/Controls/Help/UserGuides/GroupsDocuments.ru.ascx
|
2022-08-02 17:14:15 +03:00 |
|
|
|
b4de073563
|
Finish editing controls for Video.ascx
|
2022-07-31 14:39:17 +03:00 |
|
|
|
1c0b4aa46c
|
Continue editing controls for Video.ascx
|
2022-07-29 17:53:56 +03:00 |
|
|
|
39000d005b
|
Merge branch 'feature/new_german' into release/1.6.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
|
2022-07-28 15:05:02 +03:00 |
|
|
|
85f7dc2a4f
|
New translations added.
|
2022-07-17 22:16:11 +03:00 |
|
|
|
e24416bf4e
|
Add and update translations - fr
|
2022-07-08 17:37:39 +03:00 |
|
|
|
bc58f5d40d
|
Add translations fr
|
2022-07-08 12:56:39 +03:00 |
|
|
|
b785b52d0e
|
Update translations (fr, Installation, Docs)
|
2022-07-01 12:55:34 +03:00 |
|
|
|
254583fc8a
|
Fixes for Installation.ascx
|
2022-06-09 18:18:05 +03:00 |
|
|
|
9b287c56c2
|
Text fix; uncomment arm links in lists
|
2022-05-19 13:23:48 +03:00 |
|
|
|
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 |
|
|
|
c87b36fd38
|
Merge branch 'feature/build7.1-for-release' into release/1.4.0
# Conflicts:
# Web/Controls/Help/Installation/DocsDeveloper.ascx
|
2022-05-09 15:22:16 +03:00 |
|
|
|
288ed2a03c
|
Fixes for new arm articles
|
2022-05-06 12:43:37 +03:00 |
|
|
|
8188b72382
|
Merge branch 'feature/build7.1' into feature/build7.1-for-release
# Conflicts:
# Web/Controls/Help/Installation/DocsCommunity.ascx
# Web/Controls/Help/Installation/DocsDeveloper.ascx
# Web/Controls/Help/Installation/DocsEnterprise.ascx
|
2022-05-06 11:41:22 +03:00 |
|
|
|
710a20adda
|
Add articles - Installing Docs on CentOS for the 64-bit ARM
|
2022-05-06 10:40:37 +03:00 |
|
|
|
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 |
|
|
|
352e48a60b
|
small fixes for the config docs page
|
2022-04-28 18:36:31 +03:00 |
|
|
|
e7375bd37e
|
Remove 'How to install Desktop Editors to Arch' article
|
2022-04-25 18:35:05 +03:00 |
|
|
|
31135de5f0
|
Fixes for 2 new pages
|
2022-04-21 13:14:47 +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 |
|
|
|
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 |
|
|
|
54211de98d
|
Structure fix for alibaba articles
|
2022-04-13 14:12:55 +03:00 |
|
|
|
7f4fb86363
|
Add new articles - Installing ONLYOFFICE Docs on Debian systems for ARM
|
2022-04-11 14:50:59 +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 |
|
