|
|
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 |
|
|
|
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 |
|
|
|
6e2b904ae0
|
Add page templates for Installing Docs Docker version for the 64-bit ARM
|
2022-05-06 11:24:32 +03:00 |
|
|
|
710a20adda
|
Add articles - Installing Docs on CentOS for the 64-bit ARM
|
2022-05-06 10:40:37 +03:00 |
|
|
|
120fd88458
|
Add docs-connect-amazon.aspx
|
2022-04-29 15:45:54 +03:00 |
|
|
|
e7375bd37e
|
Remove 'How to install Desktop Editors to Arch' article
|
2022-04-25 18:35:05 +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 |
|
|
|
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 |
|
|
|
719c8909a4
|
Fix for workspace-saas-change-payment-plan.aspx
|
2022-03-31 16:27:16 +03:00 |
|
|
|
541bc4c7f6
|
Try to fix workspace-saas-change-payment-plan.aspx
|
2022-03-31 13:12:04 +03:00 |
|
|
|
9434a22fa3
|
Fix for docs-enterprise-install-univention.aspx
|
2022-03-31 10:38:33 +03:00 |
|
|
|
6583397eb4
|
Try to fix groups-authorization-keys.aspx
|
2022-03-30 23:53:26 +03:00 |
|
|
|
abd9e76396
|
Fixes for groups-gettingstarted-projects.aspx - Part 2
|
2022-03-25 14:13:39 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6695862877
|
New article - How to install Desktop Editors to Arch
|
2022-03-02 17:42:22 +03:00 |
|
|
|
42dada0be0
|
Try to fix 500 error on test-helpcenter.onlyoffice.com/installation/desktop-install-flatpak.aspx. Remove redirected /desktop/documents/linux/installation-flatpak.aspx.
|
2022-02-25 18:26:51 +03:00 |
|
|
|
390024dbc7
|
Add Removing ONLYOFFICE Docs for Linux article
|
2022-02-22 17:02:15 +03:00 |
|
|
|
1d1d9faad6
|
Add WebDAV article
|
2022-02-18 12:47:05 +03:00 |
|
|
|
9806e697fa
|
Rename controls
|
2022-02-15 17:04:43 +03:00 |
|
|
|
da6a928aa6
|
Merge remote-tracking branch 'remotes/origin/feature/docs-config' into feature/test-prerelease-1.4.0
# Conflicts:
# Web/Controls/Help/Installation/DocsDeveloper.ascx
|
2022-02-11 14:47:26 +03:00 |
|
|
|
ddd288d92d
|
Add 5 new videos, update tags; minor fixes
|
2022-02-08 14:42:14 +03:00 |
|
|
|
dc9a9bfd94
|
Add ONLYOFFICE Personal section
|
2022-02-01 13:52:38 +03:00 |
|
|
|
290dc3d6b8
|
Add Alibaba Cloud articles; update Amazon, Vultr, DigitalOcean Docs articles; update Workspace version
|
2022-01-28 18:38:36 +03:00 |
|
|
|
beb5b46a75
|
Merge branch 'develop' into feature/desktop_installation_guides
|
2022-01-26 14:20:50 +03:00 |
|
|
|
092350cd2c
|
Merge branch 'develop' into feature/desktop-flags
|
2022-01-25 11:34:31 +03:00 |
|
|
|
c62e364761
|
Merge branch 'feature/desktop7.0' into release/1.3.0
|
2022-01-14 15:24:46 +03:00 |
|
|
|
5fd7fe58f1
|
Merge branch 'feature/docs-7.0' into release/1.3.0
|
2022-01-14 15:24:20 +03:00 |
|
|
|
87e44f03f2
|
Add ONLYOFFICE Docs EE on Cloudron; Minor Installation section menu adjustments; Change step 3 for Cloudron article
# Conflicts:
# Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
|
2022-01-13 16:21:18 +03:00 |
|
|
|
2f05179d68
|
Added Install Docs on Cloudron article, cloudron tag
# Conflicts:
# Web/Controls/Help/GettingStarted/Integration/Confluence/Confluence.ascx
# Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
|
2022-01-13 16:12:44 +03:00 |
|
|
|
48b5ce85e4
|
added description of Docs config
|
2022-01-13 14:59:20 +03:00 |
|
|
|
e562d15449
|
Update Docker Compose article for CE, add new article for DE
|
2021-12-24 17:38:21 +03:00 |
|
|
|
f4e5d39bae
|
Remove old articles - add language to Groups (docker, windows)
|
2021-12-24 12:28:29 +03:00 |
|
|
|
99cc4be2da
|
Start adding new articles - connect desktop editors to Liferay, Kdrive
|
2021-12-23 11:33:28 +03:00 |
|
|
|
218fd801a6
|
Added AppImage, fixed Ubuntu+RedHat, added Running and Uninstalling sections to each guide.
|
2021-12-10 18:01:12 +03:00 |
|
|
|
0a1f4b1e68
|
Merge branch 'feature/custom_theme' into feature/docs-7.0
|
2021-12-06 12:06:08 +03:00 |
|
|
|
9a0aad3372
|
Initial commit.
|
2021-11-30 16:43:53 +03:00 |
|
|
|
e87510acc7
|
Some fixes
|
2021-11-26 12:16:29 +03:00 |
|
