Commit Graph

239 Commits

Author SHA1 Message Date
74d3c8ac3f Edit DocSpaceCloudRegistration.ascx 2023-06-01 18:58:55 +03:00
b0367250e9 Update screenshots in French. Edit DocSpaceSSODescription.ascx 2023-04-24 15:25:07 +03:00
5f94f31004 Merge branch 'feature/docspace' into release/1.12.0
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.fr.ascx
#	Web/Controls/Help/GettingStarted/Configuration/Configuration.ascx
#	Web/css/help.less
2023-04-21 17:05:07 +03:00
d5e577302f Add 3 new articles 2023-04-13 18:43:49 +03:00
83210312ae Merge branch 'develop' into feature/workspace-12.5
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
2023-02-22 15:11:53 +03:00
a651b4aed6 Update commands for PostgreSQL 2023-02-14 16:46:14 +03:00
cf6fcdb9ea Update several screens 2023-02-13 16:56:07 +03:00
2f5cf2e5ce Update Sharing Settings screens, minor text fixes 2023-02-10 15:20:16 +03:00
48edd2dcd8 Merge branch 'feature/build_7.3' into release/1.9.0
# Conflicts:
#	Web/Controls/Help/Server/Document/DSChangelog.ascx
#	Web/Controls/Help/Server/Document/DSChangelog.ru.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/HelpfulHints/Navigation.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/HelpfulHints/Password.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/ProgramInterface/ProgramInterface.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/HelpfulHints/Navigation.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertText.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/fr/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/HelpfulHints/Navigation.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/HelpfulHints/Password.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/ProgramInterface/DataTab.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/CopyPasteData.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertArrayFormulas.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertChart.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/InsertFunction.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/fr/UsageInstructions/SupportSmartArt.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
2023-01-31 11:28:22 +03:00
a37c8232f8 Update screens and minor text fixes for desktop editors. Update versions 2023-01-23 17:00:02 +03:00
39c77e0af9 Update several guides 2023-01-16 17:56:37 +03:00
34edd26c06 Updates for memory quota 2023-01-11 10:39:30 +03:00
ea2cc5cafd Updates for Documents module 2022-12-16 16:18:21 +03:00
2e8b8fcfb6 Updates for v12.5 (impersonation, dark theme, branding, password length) 2022-12-13 16:27:21 +03:00
abb963cd46 Add new article, new section and fixes for Docs Cloud 2022-11-23 15:44:04 +03:00
8d79a3f538 Merge branch 'feature/issue35' into develop 2022-11-18 16:49:12 +03:00
823a644d02 Fix #35 2022-11-10 13:59:19 +03:00
trovier
83c4b65973 Minor fixes (EN+DE). 2022-10-05 17:29:24 +03:00
139ee48d82 Edit paths to icons again to avoid duplicating images, remove duplicates 2022-09-30 13:09:01 +03:00
e8ebbdb845 Build 7.2: Fixes as per testing. 2022-09-20 18:12:28 +03:00
405c4a506e Duplicate icons from OfficeWeb to Guides folder and edit paths to images in User guides 2022-09-15 17:56:57 +03:00
7daa5a5217 Build 7.2: Plugin manager, hyperlink to local file. 2022-09-12 17:36:10 +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
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
e16db04f8c Updated images in EN for all editors. 2022-07-27 17:19:40 +03:00
779f776f45 Merge branch 'feature/google-workspace' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2022-07-06 10:26:14 +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
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
8f6dd10e6c Update screenshots for Personal 2022-05-06 18:58:25 +03:00
91adee86e6 Fixes as per testing; new German translations. 2022-05-05 14:00:21 +03:00
cc374c4618 Fix WorkspaceConfigureWebdav.ascx 2022-04-28 12:38:40 +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
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
953b7dffd9 Update 2 branding screens 2022-04-20 11:19:52 +03:00
d2eede8b7f Add Migrating Nextcloud data article 2022-04-19 17:01:32 +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
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
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
9e1b221ee7 Merge branch 'feature/helpcenter_12.0' of https://github.com/ONLYOFFICE/helpcenter into feature/helpcenter_12.0 2022-03-03 13:32:02 +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
e202c96c03 Update white labeling 2022-03-01 12:42:57 +03:00
1d1d9faad6 Add WebDAV article 2022-02-18 12:47:05 +03:00
78951718bb Updated screenshots. 2022-02-11 12:29:02 +03:00