|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
