Commit Graph

527 Commits

Author SHA1 Message Date
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
9a0398cf43 Add videos: Integrate Redmine, Fillable forms 2022-02-25 19:25:59 +03:00
93e0c4d32a Add Workspace Enterprise Edition Security Guide 2022-02-18 15:49:26 +03:00
492e767669 Add Nuxeo plugin video 2022-02-10 17:58:25 +03:00
ddd288d92d Add 5 new videos, update tags; minor fixes 2022-02-08 14:42:14 +03:00
46771c89f0 Correct mistakes and additions to the text, update available language table 2022-02-01 18:01:23 +03:00
dc9a9bfd94 Add ONLYOFFICE Personal section 2022-02-01 13:52:38 +03:00
a23bd75aab Update ConfigureADFS.ascx 2022-01-31 12:25:01 +03:00
290dc3d6b8 Add Alibaba Cloud articles; update Amazon, Vultr, DigitalOcean Docs articles; update Workspace version 2022-01-28 18:38:36 +03:00
beb5b46a75 Merge branch 'develop' into feature/desktop_installation_guides 2022-01-26 14:20:50 +03:00
092350cd2c Merge branch 'develop' into feature/desktop-flags 2022-01-25 11:34:31 +03:00
bf476cfa8d Replace text and image for iOSWebFillableForms.ascx, fix side menu 2022-01-18 11:59:08 +03:00
046e1af312 Merge branch 'feature/nuxeo-confluence' into release/1.3.0 2022-01-14 17:16:10 +03:00
66da3a1d34 Merge branch 'feature/owncloud-nextcloud' into release/1.3.0
# Conflicts:
#	Web/Controls/Help/Desktop/Documents/Common/ConnectNextcloud/ConnectNextcloudDesktop.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ConnectOwncloud/ConnectOwncloudDesktop.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ConnectSeafile/ConnectSeafile.ascx
2022-01-14 17:15:04 +03:00
93208fe140 Merge branch 'feature/android-5.3.0' into release/1.3.0 2022-01-14 16:50:58 +03:00
d3a845c59c Fix mobile web images 2022-01-14 16:48:59 +03:00
9d9bcdd6ab Merge branch 'feature/german_integration' into release/1.3.0 2022-01-14 16:44:44 +03:00
3ac1f4f3c6 Merge branch 'feature/ios_docs7.0' into release/1.3.0 2022-01-14 16:29: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
5fd7fe58f1 Merge branch 'feature/docs-7.0' into release/1.3.0 2022-01-14 15:24:20 +03:00
a49fbf7df4 Fix mobile web pages 2022-01-14 11:09:32 +03:00
faf0959720 Fixes as per testing + minor fixes for lists, commas, screenshots. 2022-01-13 22:29:07 +03:00
b958455f13 Fix images for Cloudron articles 2022-01-13 16:22:01 +03:00
87e44f03f2 Add ONLYOFFICE Docs EE on Cloudron; Minor Installation section menu adjustments; Change step 3 for Cloudron article
# Conflicts:
#	Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
2022-01-13 16:21:18 +03:00
2f05179d68 Added Install Docs on Cloudron article, cloudron tag
# Conflicts:
#	Web/Controls/Help/GettingStarted/Integration/Confluence/Confluence.ascx
#	Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
2022-01-13 16:12:44 +03:00
fb39ea811f Fixed as per testing. 2022-01-13 16:10:35 +03:00
0b1e68037b New Fixes for Android 2022-01-13 14:21:30 +03:00
7ab9102495 German for build 11.6. 2022-01-11 18:24:15 +03:00
d4770d5e99 Fix Liferay screen 2022-01-11 14:22:05 +03:00
a1b06482c4 Update screens - Presentation Editor 2022-01-11 13:47:23 +03:00
b7cb7e15bb Update screens - Spreadsheet Editor 2022-01-10 18:02:21 +03:00
8e2b49f25a Fixed as per testing. 2022-01-10 17:55:31 +03:00
32909c29dc Merge branch 'feature/workspace-11.6' of https://github.com/ONLYOFFICE/helpcenter into feature/workspace-11.6 2022-01-10 17:38:40 +03:00
0a07a9e0f9 German for Getting Started reworked. 2022-01-10 17:38:03 +03:00
ce3e09475d Update screens - Document Editor, part 2 2022-01-10 14:55:08 +03:00
a2dba5fee3 Update screens - Document Editor, part 1 2022-01-10 11:58:10 +03:00
3fb39bb22a Update find and replace page for all editors 2021-12-30 16:50:46 +03:00
a5e4ba9a39 Update custom colors and search for presentations 2021-12-30 15:56:18 +03:00
c423401366 Fixes and Custom colors for spreadsheets 2021-12-30 15:05:39 +03:00
ea6d749270 Update color pages for Document Editor 2021-12-30 13:11:36 +03:00
8353ee647b Update Manage Sheets pages 2021-12-30 10:31:27 +03:00
0b32fe7cf3 Fix screens 2021-12-30 08:47:28 +03:00
92adfce65b Update dark_enabling.png 2021-12-29 19:49:36 +03:00
cc88a90a34 Add android forms pages 2021-12-29 18:47:07 +03:00