Commit Graph

180 Commits

Author SHA1 Message Date
8f6dd10e6c Update screenshots for Personal 2022-05-06 18:58:25 +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
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
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
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
d4770d5e99 Fix Liferay screen 2022-01-11 14:22:05 +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
ffb0ddaefa Rename guide156 to guide158 2021-12-24 16:19:50 +03:00
5a0fdd5fe3 Update DarkTheme.ascx 2021-12-24 15:42:58 +03:00
ee6d90eb1a Update desktop editors articles 2021-12-24 11:26:04 +03:00
99cc4be2da Start adding new articles - connect desktop editors to Liferay, Kdrive 2021-12-23 11:33:28 +03:00
982ee03a9c Merge branch 'feature/postgresql' into develop 2021-12-21 14:15:34 +03:00
d63abb46d5 Update docxf screens 2021-12-21 14:01:24 +03:00
ae4f7bb6e2 Fix form guides 2021-12-15 13:04:21 +03:00
b246e90550 Updated screenshots, alphabetized index for Linux-based systems. 2021-12-13 19:13:40 +03:00
4c42d48d05 Updated screenshots for the "Running OODE" sections. 2021-12-13 15:34:37 +03:00
caac72ac94 Update CreatePortal article 2021-12-09 17:08:23 +03:00
d104820c52 Update PostgreSQL version to 12.9 2021-12-08 19:12:44 +03:00
0cd13edae8 Rename Master form to Form template, some fixes 2021-12-03 14:14:35 +03:00
1d8deb3700 Updates and fixes 2021-11-29 16:38:40 +03:00
3a18b02881 Update ShareDocuments.ascx 2021-11-23 16:47:04 +03:00
73a974fc0f Update oneLogin article (SAML Custom Connector) 2021-11-02 12:47:53 +03:00
c842c2e793 Added new article: Deploying ONLYOFFICE Workspace in Vultr 2021-09-15 20:07:48 +03:00
5fdc0cc281 New article Deploying Docs in Vultr 2021-09-14 17:24:19 +03:00
a06e9bbb67 Merge remote-tracking branch 'remotes/origin/feature/build6.3'
# Conflicts:
#	Web/Controls/Help/Server/Document/DSChangelog.ascx
#	Web/Controls/Help/Server/Document/DSChangelog.ru.ascx
#	Web/Controls/Help/Server/Windows/Community/AuthorizationKeys/AuthorizationKeys.ascx
#	Web/Controls/Help/Server/Windows/Community/AuthorizationKeys/AuthorizationKeys.de.ascx
#	Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServerDocker_Current.ascx
#	Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServerWindows_Current.ascx
#	Web/Controls/Help/VariousControls/Versions/DocumentServer/DocumentServer_Current.ascx
2021-05-19 13:00:59 +03:00
91af18ff4c Added English and German for new Classic Light theme + minor fixes. 2021-04-23 14:56:39 +03:00
9e85a1dca3 Fixes according to Bug 49534 (LDAP Support -> LDAP Settings) 2021-04-13 15:31:09 +03:00
0360be92a9 Merge branch 'feature/pricing-11.5' into feature/module_11.5 2021-04-11 19:06:47 +03:00
5c13be99a7 Updated pricing guides 2021-04-09 19:03:13 +03:00
38b9721cf1 Updated images for the Documents module 2021-04-09 16:12:59 +03:00
221246d658 Updated administration/backup-saas.aspx 2021-04-08 15:23:43 +03:00
bd3b7866f1 Started updating pricing guides 2021-04-08 11:09:03 +03:00
232e84b5bd LDAP settings (SaaS + server) in English 2021-04-07 16:10:44 +03:00
7b659856e6 Merge branch 'feature/add-links' into feature/build6.3
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.es.ascx
#	Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.ru.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/ProgramInterface/PluginsTab.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/de/UsageInstructions/FontTypeSizeColor.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/FontTypeSizeColor.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertCharts.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/ParagraphIndents.htm
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/Wordpress.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/ProgramInterface/PluginsTab.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertChart.htm
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/PivotTables.htm
2021-03-31 17:57:54 +03:00
d98b84cd44 Changed image paths for Audit Trail 2021-03-22 17:42:39 +03:00
03517ebc7b Restored missing images for Audit Trail and Login History 2021-03-22 17:25:00 +03:00
ec804128cd English articles for new features in OO Docs + English screenshots. 2021-03-22 16:53:42 +03:00
7b34ab635a Merge remote-tracking branch 'remotes/origin/feature/new_article_guest' 2021-03-18 13:06:10 +03:00
1f9b75037a Merge branch 'feature/articles_howto'
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.ru.ascx
2021-03-18 13:03:30 +03:00
965b9df529 Merge branch 'feature/desktop6.2'
# Conflicts:
#	Web/Controls/Help/ABCIndex/CompleteArticleList.ascx
2021-03-18 12:38:46 +03:00