|
|
1bd72dbc15
|
Merge branch 'feature/strapi_connector' into feature/test-merge-for-release
|
2022-04-13 09:29:40 +03:00 |
|
|
|
f39f2f1c17
|
Initial commit.
|
2022-04-11 16:27:43 +03:00 |
|
|
|
7001fca30b
|
Fix 4304_mob_andr_share_files.ascx
|
2022-04-07 13:41:36 +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 |
|
|
|
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 |
|
|
|
c4f55eb453
|
Partial fixes for desktop-video-support.aspx
|
2022-03-31 19:19:58 +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 |
|
|
|
541bc4c7f6
|
Try to fix workspace-saas-change-payment-plan.aspx
|
2022-03-31 13:12:04 +03:00 |
|
|
|
6583397eb4
|
Try to fix groups-authorization-keys.aspx
|
2022-03-30 23:53:26 +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 |
|
|
|
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 |
|
|
|
c59a07fb60
|
Add Integrate Moodle video
|
2022-03-28 17:18:49 +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 |
|
|
|
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 |
|
|
|
11539f099b
|
Fixes for groups-gettingstarted-projects.aspx Part 1
|
2022-03-24 09:59:42 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ac97b28cf3
|
Merge branch 'feature/test-3-branches-further-changes' into feature/test-merge-for-release
|
2022-03-17 13:10:38 +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 |
|
|
|
55933ce0c2
|
Beginning of optimization of local-server.ascx.
|
2022-03-09 17:42:50 +03:00 |
|
|
|
9209fac24c
|
Revert 15b380b10d and fixes for /userguides/mobile-android.aspx.
|
2022-03-03 00:46:50 +03:00 |
|
|
|
6695862877
|
New article - How to install Desktop Editors to Arch
|
2022-03-02 17:42:22 +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 |
|
|
|
9a0398cf43
|
Add videos: Integrate Redmine, Fillable forms
|
2022-02-25 19:25:59 +03:00 |
|
|
|
390024dbc7
|
Add Removing ONLYOFFICE Docs for Linux article
|
2022-02-22 17:02:15 +03:00 |
|
|
|
93e0c4d32a
|
Add Workspace Enterprise Edition Security Guide
|
2022-02-18 15:49:26 +03:00 |
|
|
|
eecd2dc17c
|
Add missing translations (fr)
|
2022-02-18 13:25:46 +03:00 |
|
|
|
fce076c3f6
|
Add translations (fr) - Installation - Workspace
|
2022-02-18 10:14:52 +03:00 |
|
|
|
a5a1fc21d7
|
Merge remote-tracking branch 'remotes/origin/feature/jitsi' into feature/test-prerelease-1.4.0
|
2022-02-11 14:46:39 +03:00 |
|
|
|
fa09dfc858
|
Update and fix tags, video pages
|
2022-02-10 18:38:40 +03:00 |
|
|
|
492e767669
|
Add Nuxeo plugin video
|
2022-02-10 17:58:25 +03:00 |
|
