Commit Graph

682 Commits

Author SHA1 Message Date
0a9419513f Build 7.2: new features, iOS update (EN only). 2022-08-26 17:46:06 +03:00
2f05e2e1e7 Initial commit. 2022-08-16 13:56:03 +03:00
25e91d7971 Merge branch 'feature/build7.2' into feature/web-apps-help
# Conflicts:
#	Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/images/paradvsettings_font.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/images/interface/rightpart.png
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/images/access_rights.png
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/images/interface/rightpart.png
2022-08-12 16:20:37 +03:00
455e5ee94d Merge branch 'feature/geolocation' into release/1.6.0 2022-08-06 12:15:30 +03:00
0fb35dcc2d Fixes for MergeCells.htm: rename some images and add 1 image in OfficeWeb, remove unnecessary images in Guides/big/ 2022-08-03 11:25:58 +03:00
39000d005b Merge branch 'feature/new_german' into release/1.6.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
2022-07-28 15:05:02 +03:00
dcb898692b Merge branch 'feature/nextcloud' into release/1.6.0
# Conflicts:
#	Web/Controls/Help/Server/ControlPanel/NextcloudMigration/nextcloud-migration.de.ascx
#	Web/Controls/Help/Server/Docker/DockerTroubleshooting/DockerTroubleshooting.de.ascx
2022-07-28 13:15:58 +03:00
e16db04f8c Updated images in EN for all editors. 2022-07-27 17:19:40 +03:00
4b98331e55 Update Nextcloud article 2022-07-25 17:43:37 +03:00
8ad5e4da07 Edit Nextcloud article - extra permissions 2022-07-22 19:02:45 +03:00
d38c0b6b17 Merge branch 'feature/fix-logo' into release/1.6.0 2022-07-19 17:44:34 +03:00
85f7dc2a4f New translations added. 2022-07-17 22:16:11 +03:00
50265a7026 Merge branch 'feature/supported-formats-icons' into release/1.6.0 2022-07-14 12:10:30 +03:00
c4c2ee21b4 Merge branch 'feature/personal_1.2' into release/1.6.0 2022-07-13 18:37:52 +03:00
e30b3f3204 Merge branch 'feature/nextcloud' into release/1.6.0 2022-07-13 18:37:29 +03:00
e579f30b14 Merge branch 'feature/connect-docs' into release/1.6.0 2022-07-13 18:36:59 +03:00
496ea6d9db Use svg instead of png 2022-07-13 17:35:24 +03:00
bacaa0d29c Merge branch 'feature/projects_ios' into develop 2022-07-12 18:03:32 +03:00
047234752b Fix Connecting Docs to Groups again 2022-07-12 11:04:43 +03:00
8a51da65dc Fix image and text - Connecting Docs to Groups 2022-07-11 18:14:31 +03:00
ab46b03485 Replace round markers with svg image 2022-07-11 10:31:28 +03:00
cab7850209 Update Personal to v1.2 2022-07-08 12:50:58 +03:00
a2e7811b10 German added + fixed links for other languages (side+main menu). 2022-07-07 16:58:43 +03:00
779f776f45 Merge branch 'feature/google-workspace' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2022-07-06 10:26:14 +03:00
cf204014bc Merge branch 'feature/freeze-rows' into develop 2022-07-06 10:19:18 +03:00
1dc1992559 German translation added. 2022-07-05 15:53:48 +03:00
0e6eea883f Merge branch 'feature/new_german' into develop
# Conflicts:
#	Web/Controls/Help/Server/ControlPanel/NextcloudMigration/nextcloud-migration.ascx
#	Web/Controls/Help/Server/ControlPanel/NextcloudMigration/nextcloud-migration.de.ascx
2022-07-05 11:40:36 +03:00
8f3c6fa9df Update GettingStartedNextcloud.ascx 2022-07-04 18:16:02 +03:00
94c2c41957 Update image 2022-06-20 10:09:14 +03:00
93e6a0a668 New article - Migrating Google Workspace data to ONLYOFFICE Workspace 2022-06-16 17:48:34 +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
985c660157 Merge branch 'feature/andr_project1.2' into release/1.5.0 2022-06-02 18:51:25 +03:00
e758782329 Update all android projects pages, screenshots 2022-06-01 15:48:13 +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
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
b8428d240b Update HeidiSQL2.png 2022-05-30 18:10:11 +03:00
da6bf28be9 Add images, text fixes 2022-05-30 11:47:34 +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
1d283367d5 Updated screenshots for German version of Nextcloud migration article. 2022-05-25 17:18:57 +03:00
1f813e9355 Update pics for Projects v2.0 2022-05-25 15:54: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
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
54ae399432 Fixes as per testing. 2022-05-19 18:15:59 +03:00
66135656ca Fixes as per v.1.0.5. 2022-05-19 18:00:42 +03:00
91e5881613 Add Add Endnotes [DE], Selective clear [SE] articles 2022-05-19 11:39:58 +03:00
14cd1b356b Fixes for WordPress as per testing + added video. 2022-05-18 16:33:38 +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
30be225226 Replace CSS code with images for buttons 2022-05-11 21:02:41 +03:00
f15f4e3f86 Alfresco update v. 6.0.0. 2022-05-11 16:54:56 +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
f0cfc8085f Update activeconnections.png 2022-05-06 20:01:30 +03:00
8f6dd10e6c Update screenshots for Personal 2022-05-06 18:58:25 +03:00
4869e2fbc5 Update GS Personal 2022-05-06 11:41:38 +03:00
91adee86e6 Fixes as per testing; new German translations. 2022-05-05 14:00:21 +03:00
a72c12bf01 Fix CalendarGettingStarted.ascx 2022-05-04 19:52:34 +03:00
cc374c4618 Fix WorkspaceConfigureWebdav.ascx 2022-04-28 12:38:40 +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
afcf616f6f CalendarGettingStarted is reworked in German. Lacks two screenshots (waiting for the interface translation). 2022-04-26 14:34:55 +03:00
5e946ef832 Add attachments to calendar events - CalendarGettingStarted.ascx 2022-04-25 12:25:44 +03:00
377f23e010 Add attachments to calendar events - CalendarGettingStarted.ascx 2022-04-25 12:22:34 +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
cb1effe260 Merge branch 'feature/build7.1' into feature/build7.1-for-release 2022-04-20 18:34:45 +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
953b7dffd9 Update 2 branding screens 2022-04-20 11:19:52 +03:00
6d7c109950 Fixes as per testing. 2022-04-19 18:10:42 +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
9fedee2516 Fixes, translations, screenshots for German version. OO Groups Documents module page is reworked in English. 2022-04-15 18:19:11 +03:00
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
fc9e289ae6 German for a part of new fixes + intermediate (!) for GettingStartedDocuments.de.ascx 2022-04-11 14:34:36 +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
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
c59a07fb60 Add Integrate Moodle video 2022-03-28 17:18:49 +03:00
5d45e84491 Add Jira video, update video thumbnails 2022-03-24 18:27:51 +03:00
e498c6be28 Add folders to Favorites 2022-03-24 17:17:30 +03:00
a102fff4fc Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/custom-domain-name/custom-domain-name.ascx
#	Web/Controls/Help/Tags/invite-people/invite-people.ascx
#	Web/Controls/Help/Tags/password-strength/password-strength.ascx
#	Web/Controls/Help/Tags/restore-backup/restore-backup.ascx
#	Web/Controls/Help/Tags/security/security.ascx
#	Web/Controls/Help/Tags/trusted-domains/trusted-domains.ascx
2022-03-18 13:30:18 +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
0638b85e88 Merge remote-tracking branch 'remotes/origin/feature/adfs' into feature/test-merge-for-release 2022-03-17 15:53:08 +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
79f2b60840 Add mail read notification 2022-03-16 16:21:02 +03:00
2f1ac5ec73 Add Project module changes, Active connections article. Update screenshots and tags 2022-03-09 18:24:41 +03:00
95b1317b42 Rework of the 'Sharing text documents' article -> 'Sharing files and folders'. 2022-03-05 16:21:23 +03:00