Commit Graph

117 Commits

Author SHA1 Message Date
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
70b16b8db0 Structure fix for editors pages 2022-05-09 14:06:35 +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
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
97f05e4c4e CardDAV - new section in People module (EN+DE). 2022-04-19 14:56:03 +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
fc9e289ae6 German for a part of new fixes + intermediate (!) for GettingStartedDocuments.de.ascx 2022-04-11 14:34:36 +03:00
e7fb15c3ed Fix for mail.aspx in languages 2022-04-07 14:02:14 +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
6583397eb4 Try to fix groups-authorization-keys.aspx 2022-03-30 23:53:26 +03:00
11539f099b Fixes for groups-gettingstarted-projects.aspx Part 1 2022-03-24 09:59:42 +03:00
d2aa901864 Fix watchvideo_block for new Personal page 2022-03-17 16:21:11 +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
ac97b28cf3 Merge branch 'feature/test-3-branches-further-changes' into feature/test-merge-for-release 2022-03-17 13:10:38 +03:00
2f1ac5ec73 Add Project module changes, Active connections article. Update screenshots and tags 2022-03-09 18:24:41 +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
9209fac24c Revert 15b380b10d and fixes for /userguides/mobile-android.aspx. 2022-03-03 00:46:50 +03:00
cf268bf695 Remove HideContents.ascx because of using Resource.resx instead. 2022-03-02 17:42:41 +03:00
c7df67bf43 Remove ShowContents.ascx because of using Resource.resx instead. 2022-03-02 17:32:08 +03:00
c7e046ecbc Remove Watchvideo.ascx because of using Resource.resx instead. 2022-03-02 17:06:43 +03:00
393bea7e2d Remove ComOpersAndr.ascx because of using Resource.resx instead. 2022-03-02 16:55:24 +03:00
15b380b10d Temporary comment huge localized block on /userguides/mobile-android.aspx for testing. 2022-03-02 16:11:11 +03:00
2c9bf74e9c Try to fix /userguides/mobile-android.aspx by using Resource.resx + changes for another pages with adding controls. 2022-03-02 16:10:08 +03:00
90ca22aade Escape from LocalizeContent for /userguides/mobile-android.aspx. 2022-02-28 15:42:06 +03:00
f2c09584fa Cut paths for /userguides/mobile-android.aspx (p2) + escape from LocalizeContent for videos. 2022-02-28 15:07:40 +03:00
7983f05964 Cut paths for /userguides/mobile-android.aspx (p1). 2022-02-28 14:49:15 +03:00
9a0398cf43 Add videos: Integrate Redmine, Fillable forms 2022-02-25 19:25:59 +03:00
c8b2ff8186 Updates: Community disabled; Birthdays moved to People 2022-02-24 16:25:12 +03:00
9806e697fa Rename controls 2022-02-15 17:04:43 +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
ef0906ae90 Fixes in translations and menus 2022-01-17 13:03:09 +03:00
80ec997a5f Merge branch 'feature/workspace-11.6' into release/1.3.0
# Conflicts:
#	Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx
#	Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.de.ascx
2022-01-14 15:35:08 +03:00
53a69d89a6 German: Minor fixes. 2022-01-12 18:42:42 +03:00
7ab9102495 German for build 11.6. 2022-01-11 18:24:15 +03:00
0c6b296eac German translation for new info in the build (no forms yet). 2021-12-23 19:29:32 +03:00
7b482433b6 Merge branch 'develop' into feature/docs-7.0 2021-12-17 16:49:05 +03:00
10f5de0de3 Merge branch 'feature/forms-new' into feature/docs-7.0
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/SavePrintDownload.htm
2021-12-17 13:20:27 +03:00
7c4702e776 Minor text fix 2021-12-17 10:43:56 +03:00
f0241371ad Move forms to a new branch 2021-12-17 09:45:35 +03:00
5f5507fead Add LanguageTool plugin video; Update thumbnails for videos; Add video scroller to UserGuides Docs pages; Minor fixes for ascx pages 2021-12-07 16:33:05 +03:00
481cbd1cd5 Add new and update existing articles for 7.0 2021-12-03 18:18:12 +03:00
2a7ff597e7 Update articles 2021-11-30 14:54:58 +03:00
f80fe008d8 Some fixes 2021-11-25 16:12:18 +03:00