Commit Graph

2506 Commits

Author SHA1 Message Date
b785b52d0e Update translations (fr, Installation, Docs) 2022-07-01 12:55:34 +03:00
dd5fc801fd Minor fix. 2022-06-29 15:22:44 +03:00
e081b3d348 CardDAV Thunderbird fix (EN+DE). 2022-06-29 15:19:23 +03:00
96c1975ffe Initial commit. 2022-06-28 18:14:02 +03:00
a4d083a1f2 Update translations (fr, Integration) 2022-06-24 11:05:04 +03:00
a1d14d5279 Fix LinuxInstallation.ascx (curl) 2022-06-21 14:07:54 +03:00
f77b78ca78 Fix LinuxInstallation.ascx 2022-06-20 16:01:20 +03:00
a55b4694ab Update LinuxInstallation.ascx 2022-06-20 10:54:30 +03:00
ad1c1b76f0 Fix ScriptRPMDEB.ascx 2022-06-17 14:00:49 +03:00
ef78a4b9d7 Update roadmap 2022-06-17 11:05:32 +03:00
98464f18ba Fix tags 2022-06-17 11:00:37 +03:00
93e6a0a668 New article - Migrating Google Workspace data to ONLYOFFICE Workspace 2022-06-16 17:48:34 +03:00
83437f5dd8 Text fix for SwitchHttpsWindowsDeveloper.ascx; fix tag 2022-06-15 15:23:36 +03:00
1966576c66 Some fixes 2022-06-15 14:58:46 +03:00
7e716e599e Update roadmap 2022-06-15 10:35:31 +03:00
c7e6308e88 Text fix 2022-06-14 16:55:31 +03:00
165a372a34 Edit sitemap, structure fixes 2022-06-14 16:51:19 +03:00
1053a100d4 Text fix - integration guides 2022-06-14 10:57:24 +03:00
654426af32 Continue updating sitemaps 2022-06-10 18:31:32 +03:00
7ce0ed5ccd Text fix 2022-06-10 10:11:32 +03:00
2c5a840402 Update roadmap for 7.2 2022-06-09 18:36:32 +03:00
402ba2d5b7 Merge branch 'develop' into feature/update-sitemap 2022-06-09 18:19:06 +03:00
254583fc8a Fixes for Installation.ascx 2022-06-09 18:18:05 +03:00
57984e8494 Continue updating sitemaps, structure fixes 2022-06-09 18:14:42 +03:00
4eae6568e7 Fixes for Integration.ascx 2022-06-09 13:26:22 +03:00
08947360aa Edit main sections order - SiteMap.ascx 2022-06-09 12:26:54 +03:00
869bfe603e Continue editing sitemaps and structure fixes 2022-06-08 18:35:08 +03:00
ba8c1fe062 Merge branch 'develop' into feature/update-sitemap 2022-06-07 10:49:53 +03:00
75b09c4747 Add roadmap for v7.2 2022-06-07 10:43:24 +03:00
d853f3946b Start updating sitemap.aspx, abc-index.aspx, sitemap.xml, edit links 2022-06-06 17:46:36 +03:00
6c7c5b33e5 Update Freeze-rows-and-columns.aspx 2022-06-06 17:41:56 +03:00
81a06e3b29 Add images and edit instructions - Connecting Docs to Groups 2022-06-03 16:36:07 +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
009fc4e95b Update changelog for Docs 7.1.1 2022-06-02 18:52:27 +03:00
985c660157 Merge branch 'feature/andr_project1.2' into release/1.5.0 2022-06-02 18:51:25 +03:00
7a69faaa00 Update changelog for Docs 7.1.1 2022-06-02 18:50:13 +03:00
90cd1cdc26 Add AppGallery link to changelog 2022-06-02 11:36:46 +03:00
23445bb131 Add missing comma 2022-06-02 11:32:12 +03:00
c11bbcaf83 Change release date 2022-06-02 11:09:46 +03:00
c1e1f29692 Update compatibility table for 7.0, 7.1, 12.0, edit 11.6 2022-06-02 10:53:45 +03:00
e758782329 Update all android projects pages, screenshots 2022-06-01 15:48:13 +03:00
fca9da9652 Merge branch 'feature/new_alfresco_wordpress' into release/1.5.0
# Conflicts:
#	Web/Controls/Help/HelpCenter.ascx
#	Web/Controls/Help/HelpCenter.de.ascx
#	Web/Controls/Help/HelpCenter.es.ascx
#	Web/Controls/Help/HelpCenter.fr.ascx
#	Web/Controls/Help/HelpCenter.it.ascx
#	Web/Controls/Help/HelpCenter.ru.ascx
2022-05-31 19:17:11 +03:00
fa5dd67525 Remove unused controls for redirected faq/hybrid.aspx 2022-05-31 18:58:05 +03:00
b55c4968a1 Remove redirected faq/integration.aspx 2022-05-31 18:36:58 +03:00
b5880da8d0 Added WordPress to main page (for all languages) 2022-05-31 17:56:01 +03:00
c8a25b26f4 Edit other faq pages (fix highlight in left menu) 2022-05-31 16:53:55 +03:00
73ee26b610 Add trial faq 2022-05-31 15:50:25 +03:00
4e0851bfb7 Merge remote-tracking branch 'remotes/origin/feature/ios7.1_german' into release/1.5.0 2022-05-31 14:25:55 +03:00
8cf7c5827d Merge remote-tracking branch 'remotes/origin/feature/german_integration_JWT' into release/1.5.0 2022-05-31 14:13:56 +03:00
e72394a98c Merge branch 'feature/andr5.4+web' into release/1.5.0 2022-05-31 14:09:58 +03:00
3de8e8ddf4 Merge branch 'feature/liferay' into release/1.5.0 2022-05-31 13:57:54 +03:00
7f731cf750 Merge branch 'feature/strapi_connector' into release/1.5.0
# Conflicts:
#	Web/images/Help/GettingStarted/Integration/Alfresco/Big/create_from_template_big.png
#	Web/images/Help/GettingStarted/Integration/Alfresco/Big/create_template_big.png
#	Web/images/Help/GettingStarted/Integration/Alfresco/Small/create_from_template_small.png
#	Web/images/Help/GettingStarted/Integration/Alfresco/Small/create_template_small.png
2022-05-31 13:55:30 +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
e1c7903957 Edit instruction 2022-05-30 16:01:18 +03:00
da827ac7f2 Fix link 2022-05-30 14:06:18 +03:00
da6bf28be9 Add images, text fixes 2022-05-30 11:47:34 +03:00
f00aed2dc6 Translation for Mattermost and Jitsi. 2022-05-27 15:43:16 +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
a9c3fd8d77 Projects - updated screenshots. 2022-05-27 15:00:17 +03:00
5914cf4e9a Start adding geolocation instructions 2022-05-27 14:38:44 +03:00
1769b4b6b8 Update desktop flags article 2022-05-26 16:27:30 +03:00
210b1151bb Update compiling articles 2022-05-26 16:03:27 +03:00
54d38b2046 Update Talk, Control Panel, Workspace changelogs, versions, dates 2022-05-26 15:27:23 +03:00
1d283367d5 Updated screenshots for German version of Nextcloud migration article. 2022-05-25 17:18:57 +03:00
9ace288b07 Update Android Projects to v2.0 2022-05-25 15:23:46 +03:00
1a1aaa2830 Fixes for Alfresco are translated into German. 2022-05-25 15:23:25 +03:00
90edb98bc6 Translation for Mattermost and Jitsi. 2022-05-24 17:01:44 +03:00
6da0c3dadf Fixes as per testing. 2022-05-23 17:59:37 +03:00
94c9f9852d New features in articles on autoshapes and images for all editors are now in German + screenshots. 2022-05-23 17:31:32 +03:00
f84ae22bb0 Mobile web ios,android: update dark theme articles, update download document formats 2022-05-20 14:48:45 +03:00
eee6991d4e Minor fix. 2022-05-19 18:17:13 +03:00
66135656ca Fixes as per v.1.0.5. 2022-05-19 18:00:42 +03:00
9574942e26 Fixes as per testing. 2022-05-19 17:39:07 +03:00
29d0eefff6 Fix desktop editors version 2022-05-19 17:13:41 +03:00
8d98271bb8 Update DS, CS versions 2022-05-19 13:38:35 +03:00
9b287c56c2 Text fix; uncomment arm links in lists 2022-05-19 13:23:48 +03:00
91e5881613 Add Add Endnotes [DE], Selective clear [SE] articles 2022-05-19 11:39:58 +03:00
89abc83f29 Hid the video for WordPress since it's for plugin. The controls remained for future use. 2022-05-18 18:23:02 +03:00
77d974dde1 Fix ARM articles again 2022-05-18 17:20:49 +03:00
dad45532ee Fixes for Liferay 2.2.0. 2022-05-18 16:43:56 +03:00
14cd1b356b Fixes for WordPress as per testing + added video. 2022-05-18 16:33:38 +03:00
e76dc4356b Fixes as per testing. 2022-05-18 14:29:38 +03:00
c164667f65 Update ARM articles 2022-05-18 12:29:54 +03:00
0680733115 Fixes as per testing. 2022-05-17 17:07:11 +03:00
ee312242ed Fix changelog dates, add videos, update language_table.js 2022-05-16 12:50:56 +03:00
81efc586f4 Added JWT section for remaining articles, Nuxeo-Strapi. Strapi translated into German. 2022-05-13 17:24:32 +03:00
3ac4bc7d62 Minor fixes. 2022-05-13 14:11:04 +03:00
f08d5a6a4f Add Import file option for Android 2022-05-13 10:12:38 +03:00
5e2d4129f3 Update Mobile Web to v7.1 2022-05-13 09:31:47 +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
00d99dba94 Update Add GPG key command 2022-05-11 18:31:44 +03:00
49f2037ce9 Update Add GPG key command 2022-05-11 18:29:04 +03:00
f15f4e3f86 Alfresco update v. 6.0.0. 2022-05-11 16:54:56 +03:00
586fa9f8a4 Update box instructions (Write all files and folders stored in Box) 2022-05-11 16:09:49 +03:00
3d419cbc27 Update sorting for Personal 2022-05-11 16:09:21 +03:00
614f693d43 Merge branch 'feature/test-merge-for-release' of https://github.com/ONLYOFFICE/helpcenter into feature/test-merge-for-release 2022-05-11 15:58:33 +03:00
e93acf400e Update box instructions (Write all files and folders stored in Box) 2022-05-11 15:57:55 +03:00
512df1bf9a Merge branch 'feature/test-merge-for-release' of https://github.com/ONLYOFFICE/helpcenter into feature/test-merge-for-release 2022-05-11 15:35:12 +03:00
b74d43ef03 Update sorting for Personal 2022-05-11 15:35:03 +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
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
9af762bd5a Remove unused VirtualMachine.ascx 2022-05-09 14:23:33 +03:00
70b16b8db0 Structure fix for editors pages 2022-05-09 14:06:35 +03:00
882e4db947 Minor text fix 2022-05-07 11:44:02 +03:00
0320d8447c Fix PdfViewer.htm 2022-05-07 11:37:58 +03:00
bb836fd357 Fix ReportTypes.ascx EN 2022-05-06 19:10:02 +03:00
6d315c94be German translation for integration connectors (Alfresco-Nextcloud), minor fixes to English equivalents. 2022-05-06 18:18:58 +03:00
d8d049b82f Fixes to GSMail, GSProjects, ReportTypes, ActiveConnections articles 2022-05-06 15:26:49 +03:00
25622249b2 Update GS Workspace Security (login, audit history) 2022-05-06 13:13:38 +03:00
288ed2a03c Fixes for new arm articles 2022-05-06 12:43:37 +03:00
68db3d52b1 Merge branch 'feature/test-merge-for-release' of https://github.com/ONLYOFFICE/helpcenter into feature/test-merge-for-release 2022-05-06 11:41:52 +03:00
4869e2fbc5 Update GS Personal 2022-05-06 11:41:38 +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
599d2fdd64 German translation for reworked Collaboration section for editors. 2022-05-05 18:46:34 +03:00
b2d0f45dd2 Minor fix for roadmap. 2022-05-05 18:03:39 +03:00
295c4fa203 Add Drawio plugin page 2022-05-05 17:43:20 +03:00
723573da74 Minor fix for ShareDocuments. 2022-05-05 15:40:02 +03:00
d1d17970b8 Minor fix for Roadmap. 2022-05-05 14:54:49 +03:00
91adee86e6 Fixes as per testing; new German translations. 2022-05-05 14:00:21 +03:00
1495c73972 Fix for ConnectAWS.ascx 2022-05-05 13:53:48 +03:00
73870963c4 Fixes as per testing (Endless OS) 2022-05-05 12:23:16 +03:00
bc1e2f284a Merge branch 'feature/test-merge-for-release' of https://github.com/ONLYOFFICE/helpcenter into feature/test-merge-for-release 2022-05-05 12:16:24 +03:00
bde358b8d7 Fixes for Roadmap 7.1. 2022-05-05 12:15:56 +03:00
a72c12bf01 Fix CalendarGettingStarted.ascx 2022-05-04 19:52:34 +03:00
f771e69fe8 Add 7.1 changelog 2022-05-04 19:18:33 +03:00
7d7a9beabf Add 7.1 changelog 2022-05-04 15:04:53 +03:00
120fd88458 Add docs-connect-amazon.aspx 2022-04-29 15:45:54 +03:00
352e48a60b small fixes for the config docs page 2022-04-28 18:36:31 +03:00
7d1ac64765 Update LinuxTroubleshooting.ascx 2022-04-28 17:24:42 +03:00
9fa68836b7 Fix commands for adding GPG key once again 2022-04-28 17:00:24 +03:00
e266497257 Add changelog for 12.0 2022-04-28 12:39:39 +03:00
4d15d03843 Fix nextcloud-migration.ascx 2022-04-28 12:39:19 +03:00
7549e5478b Fixes as per testing in EN and DE. 2022-04-28 12:38:59 +03:00
cc374c4618 Fix WorkspaceConfigureWebdav.ascx 2022-04-28 12:38:40 +03:00
f4a576cf76 Undo changes to documentversions.ascx 2022-04-28 12:38:19 +03:00
68ca8d7006 Add Ubuntu 18.04 and note for ARM 2022-04-28 12:31:09 +03:00
82ebea81ba Update WindowsTroubleshooting.ascx 2022-04-28 12:18:43 +03:00
47c33beb8e Fix command for adding GPG key 2022-04-28 11:29:00 +03:00
d268adf3ba Add Ubuntu 18.04 and note for ARM 2022-04-27 12:35:32 +03:00
4bea379412 Fixed links for TOC in ShareDocuments. 2022-04-26 16:58:42 +03:00
f510f24ba5 Fixes for iOS 7.1 as per testing. 2022-04-26 16:40:31 +03:00
26b7ce1020 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/web.config
2022-04-26 16:38:08 +03:00
d0b296cd94 Fixes for iOS 7.1 as per testing. 2022-04-26 16:24:41 +03:00
6ea751c6d1 Added Strapi to header and main page in all languages. 2022-04-26 15:04:39 +03:00
d61e938711 Deleted two unused articles, set redirect. 2022-04-26 14:53:31 +03:00
63fbb4aaea Minor fix in German. 2022-04-26 14:38:58 +03:00
f9b1e132c4 Merge branch 'feature/helpcenter_12.0' of https://github.com/ONLYOFFICE/helpcenter into feature/helpcenter_12.0 2022-04-26 14:35:32 +03:00
afcf616f6f CalendarGettingStarted is reworked in German. Lacks two screenshots (waiting for the interface translation). 2022-04-26 14:34:55 +03:00
b8ea90173c Remove 2 old articles - compile-desktop-windows.aspx, compile-desktop-ubuntu.aspx 2022-04-26 13:14:25 +03:00
80ef64a741 Fixes for nextcloud-migration.ascx 2022-04-26 11:05:03 +03:00
e7375bd37e Remove 'How to install Desktop Editors to Arch' article 2022-04-25 18:35:05 +03:00
e658bac31d Fixes for nextcloud-migration.ascx 2022-04-25 17:05:58 +03:00
12658a3f07 Remove old unnecessary virtual guides 2022-04-25 14:38:01 +03:00
5e946ef832 Add attachments to calendar events - CalendarGettingStarted.ascx 2022-04-25 12:25:44 +03:00
e5174664ee Move birthdays from Community to People in notification articles - all languages 2022-04-25 12:25:18 +03:00
377f23e010 Add attachments to calendar events - CalendarGettingStarted.ascx 2022-04-25 12:22:34 +03:00
386f3c961c Move birthdays from Community to People in notification articles - all languages 2022-04-22 18:25:08 +03:00
ad8a710955 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.es.ascx
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.fr.ascx
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.it.ascx
#	Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.ru.ascx
#	Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.ascx
#	Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.de.ascx
#	Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.es.ascx
#	Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.fr.ascx
#	Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.it.ascx
#	Web/Controls/Help/ArticlesCompleteList/Guides/032_import-contacts-from-web/032_import-contacts-from-web.ru.ascx
2022-04-22 14:55:27 +03:00
979a0aedde Fixes for Import contacts from Google in all languages: updated screenshots, deleted mentions of Yahoo and Windows Live, fixed the 'Administration/Managing Users' menus 2022-04-22 14:25:12 +03:00
6f6bd64fcc Merge branch 'feature/test-merge-for-release' of https://github.com/ONLYOFFICE/helpcenter into feature/test-merge-for-release 2022-04-21 17:03:56 +03:00
57b0cca758 LinuxInstallation (Ubuntu, Debian, derivatives) is translated into German. 2022-04-21 17:02:42 +03:00
fcb3c26f0e Fix hote for flags article 2022-04-21 15:19:49 +03:00
97ad3db83d added ids to the config parameters 2022-04-21 15:07:03 +03:00
f3fca21afc Remove old duplicate page 2022-04-21 14:48:27 +03:00
31135de5f0 Fixes for 2 new pages 2022-04-21 13:14:47 +03:00
b6d215af76 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
#	Web/Controls/Help/Administration/Administration.de.ascx
#	Web/Controls/Help/Administration/ControlPanel.de.ascx
2022-04-21 09:14:00 +03:00
b7e0c24f3a Fix path 2022-04-20 20:22:21 +03:00
2c8c826eaf Fix side menu for new page 2022-04-20 19:00:34 +03:00
cb1effe260 Merge branch 'feature/build7.1' into feature/build7.1-for-release 2022-04-20 18:34:45 +03:00
d691ecc6d8 Feed tool: main page, header + German. AuthorizationKeys.de.ascx fixes. ControlPanel.de.ascx fixes. 2022-04-20 17:40:51 +03:00
9f538bde0a Fix LinuxRemoveDocs.ascx 2022-04-20 17:39:09 +03:00
ef981fa731 Fix flags and KeyboardShortcuts.htm 2022-04-20 16:53:03 +03:00
4df45fab4a Text fixes for nextcloud-migration.ascx 2022-04-20 16:27:50 +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
88ca527798 New iOS features (EN). 2022-04-20 14:34:32 +03:00
b3f06a8240 Update AuthorizationKeys RU - alphabetical order 2022-04-20 11:35:23 +03:00
5d00f8d518 Fix SMTPSettings.ascx - mail.ru 2022-04-19 19:02:46 +03:00
3355783da9 Fix "Our support policy" note 2022-04-19 18:43:07 +03:00
452d669c72 Text fix for Flags.ascx 2022-04-19 18:16:52 +03:00
6d7c109950 Fixes as per testing. 2022-04-19 18:10:42 +03:00
ae340bbd01 Move updated DSRoadmap.ascx from the feature/roadmap_7.1 branch 2022-04-19 18:09:06 +03:00
d2eede8b7f Add Migrating Nextcloud data article 2022-04-19 17:01:32 +03:00
025f33ed47 Fixes as per testing. 2022-04-19 15:03:48 +03:00
97f05e4c4e CardDAV - new section in People module (EN+DE). 2022-04-19 14:56:03 +03:00
9d579958fc Update smsc instruction - AuthorizationKeys.ascx (en+ru) 2022-04-15 18:38:21 +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
0bf25ba40e Merge remote-tracking branch 'remotes/origin/feature/docs-config-7.1' into feature/build7.1-for-release 2022-04-15 17:34:08 +03:00
e87a59a739 Fixes for new pages 2022-04-15 17:11:52 +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
eaccbe7dbe Text fixes for EE FAQs 2022-04-15 14:14:04 +03:00
e66a66dcad AuthorizationKeys rework: alphabetical order, English and German are uniformed. 2022-04-14 15:11:07 +03:00
4229a6272f updated the document config for v7.1 2022-04-14 15:07:49 +03:00
54211de98d Structure fix for alibaba articles 2022-04-13 14:12:55 +03:00
6083b1a4ba Remove unused controls in ArticlesCompleteList 2022-04-13 13:38:54 +03:00
076ae0fd2f Rename 176_strapi.ascx in ArticlesCompleteList 2022-04-13 11:26:03 +03:00
1ef0e7dd6f Text fix for desktop-flags.aspx 2022-04-13 11:21:41 +03:00
8538faa640 Remove old unused controls for desktop editors 2022-04-13 10:28:05 +03:00
cb9c65f50a Remove old unused DocumentsDesktop.ascx 2022-04-13 10:20:18 +03:00
1900fd44cf Structure fix for new Strapi article 2022-04-13 10:02:54 +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
516f537fca Fixes for ReportIssues.ascx as per testing. 2022-04-11 16:51:11 +03:00
f39f2f1c17 Initial commit. 2022-04-11 16:27:43 +03:00
7f4fb86363 Add new articles - Installing ONLYOFFICE Docs on Debian systems for ARM 2022-04-11 14:50:59 +03:00
fc9e289ae6 German for a part of new fixes + intermediate (!) for GettingStartedDocuments.de.ascx 2022-04-11 14:34:36 +03:00
60d21c41b2 Text fix for docs-community-update-linux.aspx 2022-04-11 11:50:53 +03:00
d8deca8b3a Fix #24 2022-04-11 10:38:56 +03:00
163ac6156b Text fix for gettingstarted-nuxeo.aspx 2022-04-08 18:52:58 +03:00
a041009a12 Text fix for groups-smtp-settings.aspx 2022-04-08 18:45:26 +03:00
aa6eebf2e2 Text fix for groups-install-docker.aspx 2022-04-08 17:18:54 +03:00
3913802fe3 Text fixes 2022-04-07 16:26:41 +03:00
e7fb15c3ed Fix for mail.aspx in languages 2022-04-07 14:02:14 +03:00
7001fca30b Fix 4304_mob_andr_share_files.ascx 2022-04-07 13:41:36 +03:00
39d4a92158 Fix DocumentEditorTableOfContents.de.ascx 2022-04-06 18:48:05 +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
72be3bc2b2 Fixes for Nextcloud. 2022-04-05 13:34:35 +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
ae3f242ba2 Remove unused /Cloud/General.ascx controls 2022-04-01 00:08:30 +03:00
b52957a116 Remove old unnecessary general.aspx page 2022-03-31 23:43:47 +03:00
2b2f3aa01b Remove unused HostingPageButtons.ascx 2022-03-31 23:07:56 +03:00
833c81300e Fix CloudPageButtons.ascx 2022-03-31 22:50:41 +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
ed2d376f47 Fixes for Moodle.ascx EN. 2022-03-31 15:31:00 +03:00
38fce07750 Sharing_Docs module rework. 2022-03-31 15:12:36 +03:00
541bc4c7f6 Try to fix workspace-saas-change-payment-plan.aspx 2022-03-31 13:12:04 +03:00
fe9f9d0628 Fixes for docs-community-add-themes-windows.aspx 2022-03-31 10:16:37 +03:00
f46a66a3a9 Fixes for Docs system requirements 2022-03-31 10:05:15 +03:00
6eed475f91 Fixes for docs-community-connect-groups-linux.aspx 2022-03-31 09:18:19 +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
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