Commit Graph

3091 Commits

Author SHA1 Message Date
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
d61e938711 Deleted two unused articles, set redirect. 2022-04-26 14:53:31 +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
2dbccfc365 Add note for sorting by group 2022-04-26 11:05:32 +03:00
80ef64a741 Fixes for nextcloud-migration.ascx 2022-04-26 11:05:03 +03:00
03bba81fa7 Add note for sorting by group 2022-04-26 11:03:05 +03:00
e658bac31d Fixes for nextcloud-migration.ascx 2022-04-25 17:05:58 +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
1b2982907a Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release 2022-04-22 13:11:26 +03:00
fe91c26c77 Collaboration section (EN) for all editors: fixed links. 2022-04-22 12:40:28 +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
d691ecc6d8 Feed tool: main page, header + German. AuthorizationKeys.de.ascx fixes. ControlPanel.de.ascx fixes. 2022-04-20 17:40:51 +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
b3f06a8240 Update AuthorizationKeys RU - alphabetical order 2022-04-20 11:35:23 +03:00
953b7dffd9 Update 2 branding screens 2022-04-20 11:19:52 +03:00
d012cf3b93 Fix Jitsi 2022-04-20 10:49:56 +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
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
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
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
c7ec727baf Text fix for KeyboardShortcuts.htm 2022-04-13 12:22:36 +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
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
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