Commit Graph

2235 Commits

Author SHA1 Message Date
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
f00aed2dc6 Translation for Mattermost and Jitsi. 2022-05-27 15:43:16 +03:00
46bf7caecb Merge remote-tracking branch 'remotes/origin/feature/drawio' into develop
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/Contents.json
2022-05-27 15:37:12 +03:00
1769b4b6b8 Update desktop flags article 2022-05-26 16:27:30 +03:00
210b1151bb Update compiling articles 2022-05-26 16:03:27 +03:00
54d38b2046 Update Talk, Control Panel, Workspace changelogs, versions, dates 2022-05-26 15:27:23 +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
eee6991d4e Minor fix. 2022-05-19 18:17:13 +03:00
66135656ca Fixes as per v.1.0.5. 2022-05-19 18:00:42 +03:00
9574942e26 Fixes as per testing. 2022-05-19 17:39:07 +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
9b287c56c2 Text fix; uncomment arm links in lists 2022-05-19 13:23:48 +03:00
89abc83f29 Hid the video for WordPress since it's for plugin. The controls remained for future use. 2022-05-18 18:23:02 +03:00
77d974dde1 Fix ARM articles again 2022-05-18 17:20:49 +03:00
dad45532ee Fixes for Liferay 2.2.0. 2022-05-18 16:43:56 +03:00
14cd1b356b Fixes for WordPress as per testing + added video. 2022-05-18 16:33:38 +03:00
e76dc4356b Fixes as per testing. 2022-05-18 14:29:38 +03:00
c164667f65 Update ARM articles 2022-05-18 12:29:54 +03:00
0680733115 Fixes as per testing. 2022-05-17 17:07:11 +03:00
ee312242ed Fix changelog dates, add videos, update language_table.js 2022-05-16 12:50:56 +03:00
3ac4bc7d62 Minor fixes. 2022-05-13 14:11:04 +03:00
b2cfc6aaaf New article for WordPress connector (EN only). 2022-05-12 15:06:49 +03:00
00d99dba94 Update Add GPG key command 2022-05-11 18:31:44 +03:00
f15f4e3f86 Alfresco update v. 6.0.0. 2022-05-11 16:54:56 +03:00
586fa9f8a4 Update box instructions (Write all files and folders stored in Box) 2022-05-11 16:09:49 +03:00
3d419cbc27 Update sorting for Personal 2022-05-11 16:09:21 +03:00
b81711db77 Rename PdfViewer.htm to Viewer.htm, minor text fixes 2022-05-11 11:51:18 +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
882e4db947 Minor text fix 2022-05-07 11:44:02 +03:00
0320d8447c Fix PdfViewer.htm 2022-05-07 11:37:58 +03:00
bb836fd357 Fix ReportTypes.ascx EN 2022-05-06 19:10:02 +03:00
6d315c94be German translation for integration connectors (Alfresco-Nextcloud), minor fixes to English equivalents. 2022-05-06 18:18:58 +03:00
d8d049b82f Fixes to GSMail, GSProjects, ReportTypes, ActiveConnections articles 2022-05-06 15:26:49 +03:00
25622249b2 Update GS Workspace Security (login, audit history) 2022-05-06 13:13:38 +03:00
288ed2a03c Fixes for new arm articles 2022-05-06 12:43:37 +03:00
68db3d52b1 Merge branch 'feature/test-merge-for-release' of https://github.com/ONLYOFFICE/helpcenter into feature/test-merge-for-release 2022-05-06 11:41:52 +03:00
4869e2fbc5 Update GS Personal 2022-05-06 11:41:38 +03:00
8188b72382 Merge branch 'feature/build7.1' into feature/build7.1-for-release
# Conflicts:
#	Web/Controls/Help/Installation/DocsCommunity.ascx
#	Web/Controls/Help/Installation/DocsDeveloper.ascx
#	Web/Controls/Help/Installation/DocsEnterprise.ascx
2022-05-06 11:41:22 +03:00
6e2b904ae0 Add page templates for Installing Docs Docker version for the 64-bit ARM 2022-05-06 11:24:32 +03:00
710a20adda Add articles - Installing Docs on CentOS for the 64-bit ARM 2022-05-06 10:40:37 +03:00
599d2fdd64 German translation for reworked Collaboration section for editors. 2022-05-05 18:46:34 +03:00
b2d0f45dd2 Minor fix for roadmap. 2022-05-05 18:03:39 +03:00