Commit Graph

211 Commits

Author SHA1 Message Date
557f2b6562 Fixes for arm, update product versions 2022-09-26 15:18:19 +03:00
96721b1cb4 Edit left menu for contribution pages 2022-08-10 16:37:39 +03:00
a30649c967 Edit download buttons 2022-07-14 16:00:21 +03:00
654426af32 Continue updating sitemaps 2022-06-10 18:31:32 +03:00
57984e8494 Continue updating sitemaps, structure fixes 2022-06-09 18:14:42 +03:00
869bfe603e Continue editing sitemaps and structure fixes 2022-06-08 18:35:08 +03:00
54d38b2046 Update Talk, Control Panel, Workspace changelogs, versions, dates 2022-05-26 15:27:23 +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
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
599d2fdd64 German translation for reworked Collaboration section for editors. 2022-05-05 18:46:34 +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
9fedee2516 Fixes, translations, screenshots for German version. OO Groups Documents module page is reworked in English. 2022-04-15 18:19:11 +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
4f53d682cf Try to fix docs-community-connect-groups-linux.aspx 2022-03-30 16:08:18 +03:00
60f121b540 Try to fix administration/control-panel-ldap.aspx 2022-03-29 17:25:47 +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
ea87e6cecd Edit other controls for installation/mail-connect-groups-windows.aspx 2022-03-16 17:44:14 +03:00
daeb2f6bdc Finish editing local-server.ascx 2022-03-15 14:25:37 +03:00
e88968f0ec Rework: Collaboration section (SSE, PE). 2022-03-10 18:05:09 +03:00
04ad07da3e Restore missing CommonOpersForAndr in Resource.resx
Some changes for /installation/mail-connect-groups-windows.aspx
Remove redirected page server/docker/mail/connect-mail-server-to-community-server-on-windows.aspx
Update 2 commands in .ru controls
2022-03-09 13:10:10 +03:00
6fd6fc964b Some changes on / mail-connect-groups-windows.aspx editing. 2022-03-05 16:36:23 +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
f2c09584fa Cut paths for /userguides/mobile-android.aspx (p2) + escape from LocalizeContent for videos. 2022-02-28 15:07:40 +03:00
9806e697fa Rename controls 2022-02-15 17:04:43 +03:00
290dc3d6b8 Add Alibaba Cloud articles; update Amazon, Vultr, DigitalOcean Docs articles; update Workspace version 2022-01-28 18:38:36 +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
c62e364761 Merge branch 'feature/desktop7.0' into release/1.3.0 2022-01-14 15:24:46 +03:00
3949d636f5 Update Desktop Editors changelog and version 2022-01-12 11:39:44 +03:00
0c6b296eac German translation for new info in the build (no forms yet). 2021-12-23 19:29:32 +03:00
8b1c8da7d1 Update Groups version 2021-12-06 13:59:57 +03:00
0a1f4b1e68 Merge branch 'feature/custom_theme' into feature/docs-7.0 2021-12-06 12:06:08 +03:00
481cbd1cd5 Add new and update existing articles for 7.0 2021-12-03 18:18:12 +03:00
SvetlanaLisina
9ca1715c7e bugfix links 2021-11-24 19:03:33 +03:00
SvetlanaLisina
2e91699feb fix integration 2021-11-24 19:02:42 +03:00
SvetlanaLisina
5526849ebf Фикс прекомпиляции хелпцентра
# Conflicts:
#	Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
#	Web/Controls/Help/GettingStarted/Integration/Mattermost/GettingStartedMattermost.ascx
#	Web/Integration/gettingstarted-mattermost.aspx
#	Web/Integration/gettingstarted-redmine.aspx
2021-11-24 19:02:19 +03:00
9321d8562d фикс прекомпиляции хелпцентра 2021-11-24 18:51:05 +03:00
03747acf32 Merge branch 'feature/add-video' into release/1.2.0 2021-11-24 18:24:17 +03:00
894bff0f80 Update DS version 2021-11-23 17:13:21 +03:00
4898f75032 Update Download link for Integration pages 2021-10-22 18:33:04 +03:00
2fefc00c9a Add new videos, add new sections to Video.ascx 2021-10-15 15:01:45 +03:00