|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
9806e697fa
|
Rename controls
|
2022-02-15 17:04:43 +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 |
|
|
|
dc9a9bfd94
|
Add ONLYOFFICE Personal section
|
2022-02-01 13:52:38 +03:00 |
|
|
|
053b36e95e
|
OO Groups completed.
|
2022-01-18 19:03:18 +03:00 |
|
|
|
bf476cfa8d
|
Replace text and image for iOSWebFillableForms.ascx, fix side menu
|
2022-01-18 11:59:08 +03:00 |
|
|
|
ef0906ae90
|
Fixes in translations and menus
|
2022-01-17 13:03:09 +03:00 |
|
|
|
93208fe140
|
Merge branch 'feature/android-5.3.0' into release/1.3.0
|
2022-01-14 16:50:58 +03:00 |
|
|
|
3ac1f4f3c6
|
Merge branch 'feature/ios_docs7.0' into release/1.3.0
|
2022-01-14 16:29:09 +03:00 |
|
|
|
53a69d89a6
|
German: Minor fixes.
|
2022-01-12 18:42:42 +03:00 |
|
|
|
be525cf41a
|
Add translations for 7.0 (FR)
|
2022-01-11 16:06:27 +03:00 |
|
|
|
cc88a90a34
|
Add android forms pages
|
2021-12-29 18:47:07 +03:00 |
|
|
|
ed4ae80816
|
German for iOS Docs 7.0.
|
2021-12-28 18:33:27 +03:00 |
|
|
|
dc2203242c
|
English: Updated Docs as per build 7.0.
|
2021-12-27 19:05:48 +03:00 |
|
|
|
0c6b296eac
|
German translation for new info in the build (no forms yet).
|
2021-12-23 19:29:32 +03:00 |
|
|
|
4fa253bba2
|
Add Jitsi page
|
2021-12-17 14:49:46 +03:00 |
|
|
|
10f5de0de3
|
Merge branch 'feature/forms-new' into feature/docs-7.0
# Conflicts:
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/SavePrintDownload.htm
|
2021-12-17 13:20:27 +03:00 |
|
|
|
f0241371ad
|
Move forms to a new branch
|
2021-12-17 09:45:35 +03:00 |
|
|
|
481cbd1cd5
|
Add new and update existing articles for 7.0
|
2021-12-03 18:18:12 +03:00 |
|
|
|
7c98469ca1
|
Merge branch 'feature/jira' into hotfix/1.2.1
# Conflicts:
# Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
# Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
# Web/Controls/Help/Tags/docker-version/docker-version.ascx
# Web/Controls/Help/Tags/document-server/document-server.ascx
# Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
# Web/Controls/Help/Tags/linux-version/linux-version.ascx
# Web/Controls/Help/Tags/local-server/local-server.ascx
# Web/Controls/Help/Tags/open-source-version/open-source-version.ascx
# Web/css/help.less
|
2021-12-02 11:50:57 +03:00 |
|
|
|
e87510acc7
|
Some fixes
|
2021-11-26 12:16:29 +03:00 |
|
|
|
5d52e36aa8
|
Merge branch 'feature/communication_plugins' into release/1.2.0
# Conflicts:
# Changelog.md
|
2021-11-24 19:51:08 +03:00 |
|
|
|
48112ac26d
|
Update PEMainMenu.de.ascx
|
2021-11-24 19:09:03 +03:00 |
|
|
|
d0122ba7da
|
Update New FR controls from feature/translations-fr-part3
|
2021-11-24 19:05:05 +03:00 |
|
SvetlanaLisina
|
9ca1715c7e
|
bugfix links
|
2021-11-24 19:03:33 +03:00 |
|
SvetlanaLisina
|
e34e5cf40e
|
bugfix
|
2021-11-24 19:03:17 +03:00 |
|
SvetlanaLisina
|
5526849ebf
|
Фикс прекомпиляции хелпцентра
# Conflicts:
# Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
# Web/Controls/Help/GettingStarted/Integration/Mattermost/GettingStartedMattermost.ascx
# Web/Integration/gettingstarted-mattermost.aspx
# Web/Integration/gettingstarted-redmine.aspx
|
2021-11-24 19:02:19 +03:00 |
|
|
|
3c569d0e5e
|
Merge branch 'feature/redmine' into release/1.2.0
|
2021-11-24 18:48:25 +03:00 |
|
|
|
6ad4bf2995
|
Merge branch 'feature/translations-fr-part3' into release/1.2.0
|
2021-11-24 18:46:25 +03:00 |
|
|
|
5feb8f514d
|
Add redmine article
|
2021-11-10 18:29:20 +03:00 |
|
|
|
28e6b756d3
|
Add translations (fr) - UserGuides index pages
|
2021-10-28 11:42:35 +03:00 |
|
|
|
e79a43eb96
|
Add moodle article
|
2021-10-26 18:00:23 +03:00 |
|
|
|
19c45a7d17
|
Add index pages - fr
|
2021-10-18 14:24:50 +03:00 |
|
|
|
c9e71ea9ec
|
Merge branch 'feature/administration_guides' into release/1.1.0
|
2021-10-14 12:15:25 +03:00 |
|
|
|
3595eabe0a
|
German translation completed.
|
2021-10-13 23:15:34 +03:00 |
|
|
|
603ab47cfb
|
Added Communication Plugins articles (Telegram, Rainbow)
|
2021-10-08 17:28:01 +03:00 |
|
|
|
87494b430d
|
Merge branch 'feature/mob_projects_android' into release/1.0.0
|
2021-10-07 19:02:25 +03:00 |
|
|
|
ea67aaea73
|
Merge branch 'feature/nuxeo-confluence'
|
2021-09-27 13:02:31 +03:00 |
|
|
|
09463fab27
|
Added 5.2 Android: updated articles, images, changelog, web.config
|
2021-09-24 16:14:39 +03:00 |
|
|
|
6fff7362b6
|
Update Confluence, Liferay, Nuxeo articles; Add Chamilo article; Add Nuxeo video
|
2021-09-20 14:58:20 +03:00 |
|
|
|
1a8945b51e
|
Add new article: onlyoffice-jira connector
|
2021-09-20 12:32:00 +03:00 |
|
|
|
d5550b03a2
|
Added changelog for Android Projects and minor text fixes
|
2021-09-10 17:12:56 +03:00 |
|
|
|
05b50f5795
|
Merge remote-tracking branch 'remotes/origin/master' into feature/mob_projects_android
# Conflicts:
# Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
|
2021-08-31 12:26:53 +03:00 |
|
|
|
4611f18a19
|
Merge remote-tracking branch 'remotes/origin/feature/array-formulas'
# Conflicts:
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/UseFunctions/UseFunctions.ascx
# Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/Contents.json
|
2021-08-26 17:20:31 +03:00 |
|
|
|
cca720e5e2
|
Updated indexes (all languages) contents (en), side menu and ArticlesCompleteList
|
2021-08-25 17:04:50 +03:00 |
|
|
|
24782bc406
|
Updated SideMenu, ArticlesCompleteList (fr)
|
2021-08-25 13:47:43 +03:00 |
|
