|
343db094f0
|
Edit SideMenu - Coediting, fr
|
2022-07-27 16:31:41 +03:00 |
|
|
a186f05928
|
Merge remote-tracking branch 'remotes/origin/feature/projects_ios' into release/1.5.0
|
2022-06-03 10:12:01 +03:00 |
|
|
e72394a98c
|
Merge branch 'feature/andr5.4+web' into release/1.5.0
|
2022-05-31 14:09:58 +03:00 |
|
|
50d3a3f899
|
Merge branch 'feature/new_alfresco_wordpress' into release/1.5.0
# Conflicts:
# Web/Controls/Common/BaseHeader/BaseHeader.ascx
# Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.ascx
# Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.de.ascx
# Web/Controls/Help/Integration/Integration.ascx
# Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx
# Web/Controls/Help/Video/Video.ascx
# Web/css/help.less
|
2022-05-31 13:48:44 +03:00 |
|
|
3ebe905196
|
Initial commit for new Projects app version.
|
2022-05-30 18:22:11 +03:00 |
|
|
46bf7caecb
|
Merge remote-tracking branch 'remotes/origin/feature/drawio' into develop
# Conflicts:
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/Contents.json
|
2022-05-27 15:37:12 +03:00 |
|
|
91e5881613
|
Add Add Endnotes [DE], Selective clear [SE] articles
|
2022-05-19 11:39:58 +03:00 |
|
|
e4eb071b6f
|
Update Android Documents to v5.4
|
2022-05-13 07:25:12 +03:00 |
|
|
b2cfc6aaaf
|
New article for WordPress connector (EN only).
|
2022-05-12 15:06:49 +03:00 |
|
|
b81711db77
|
Rename PdfViewer.htm to Viewer.htm, minor text fixes
|
2022-05-11 11:51:18 +03:00 |
|
|
8ceeeebb9f
|
Some more structure fixes for editors pages
|
2022-05-09 19:18:34 +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 |
|
|
70b16b8db0
|
Structure fix for editors pages
|
2022-05-09 14:06:35 +03:00 |
|
|
0320d8447c
|
Fix PdfViewer.htm
|
2022-05-07 11:37:58 +03:00 |
|
|
599d2fdd64
|
German translation for reworked Collaboration section for editors.
|
2022-05-05 18:46:34 +03:00 |
|
|
295c4fa203
|
Add Drawio plugin page
|
2022-05-05 17:43:20 +03:00 |
|
|
2c8c826eaf
|
Fix side menu for new page
|
2022-04-20 19:00:34 +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 |
|
|
9fedee2516
|
Fixes, translations, screenshots for German version. OO Groups Documents module page is reworked in English.
|
2022-04-15 18:19:11 +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 |
|
|
1bd72dbc15
|
Merge branch 'feature/strapi_connector' into feature/test-merge-for-release
|
2022-04-13 09:29:40 +03:00 |
|
|
5ca9fffc48
|
Add aspx pages and menu for new htm pages
|
2022-04-12 14:49:46 +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 |
|
|
e88968f0ec
|
Rework: Collaboration section (SSE, PE).
|
2022-03-10 18:05:09 +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 |
|
|
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 |
|