IlyaSobolev/helpcenter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 27 Wiki Activity

Merge branch 'feature/vultr' into for-test-new

Browse Source 
# Conflicts:
#	Web/Controls/Help/Installation/Docs.ascx
#	Web/Controls/Help/Installation/DocsCommunity.ascx
#	Web/Controls/Help/Installation/Installation.ascx
This commit is contained in:
Svetlana Maleeva 2021-09-16 15:04:52 +03:00
commit 28f0fa5d3d
7 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Web/Controls/Help/Installation/Docs.ascx
View File

@ -78,21 +78,13 @@
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Guides/124_install-office-apps/124_install-office-apps.ascx" /></li>
</ul>
</li>
<li>DigitalOcean
<li>1-Click Apps
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/DigitalOcean/001_deploydocs/001_deploydocs.ascx" /></li>
</ul>
</li>
<li>Cloudron
<ul>
<li>
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Cloudron/190_docs_cloudron/190_docs_cloudron.ascx" />
</li>
<li>Vultr
<ul>
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Cloudron/190_docs_cloudron/190_docs_cloudron.ascx" />
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Vultr/0001_deploydocs/0001_deploydocs.ascx" /></li>
</ul>
</li>
</li>
</ul>
</li>
<li><h6>Configuring</h6>

8
Web/Controls/Help/Installation/DocsCommunity.ascx
View File

@ -78,18 +78,12 @@
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Guides/124_install-office-apps/124_install-office-apps.ascx" /></li>
</ul>
</li>
<li>DigitalOcean
<li>1-Click Apps
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/DigitalOcean/001_deploydocs/001_deploydocs.ascx" /></li>
</ul>
</li>
<li>Cloudron
<ul>
<li>
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Cloudron/190_docs_cloudron/190_docs_cloudron.ascx" />
</li>
<li>Vultr
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Vultr/0001_deploydocs/0001_deploydocs.ascx" /></li>
</ul>
</li>

16
Web/Controls/Help/Installation/Installation.ascx
View File

@ -75,13 +75,9 @@
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/ServerWindows/50016_install_community_edition/50016_install_community_edition.ascx" /></li>
</ul>
</li>
<li>DigitalOcean
<li>1-Click Apps
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/ServerDocker/70054_deploy_community_in_digitalocean/70054_deploy_community_in_digitalocean.ascx" /></li>
</ul>
</li>
<li>Vultr
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Vultr/0002_workspace/0002_workspace.ascx" /></li>
</ul>
</li>
@ -475,20 +471,12 @@
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Guides/124_install-office-apps/124_install-office-apps.ascx" /></li>
</ul>
</li>
<li>DigitalOcean
<li>1-Click Apps
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/DigitalOcean/001_deploydocs/001_deploydocs.ascx" /></li>
</ul>
</li>
<li>Cloudron
<ul>
<li>
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Cloudron/190_docs_cloudron/190_docs_cloudron.ascx" />
</li>
</ul>
</li>
<li>Vultr
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Vultr/0001_deploydocs/0001_deploydocs.ascx" /></li>
</ul>
</li>

8
Web/Controls/Help/Installation/Workspace.ascx
View File

@ -65,16 +65,12 @@
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/ServerWindows/50016_install_community_edition/50016_install_community_edition.ascx" /></li>
</ul>
</li>
<li>DigitalOcean
<li>1-Click Apps
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/ServerDocker/70054_deploy_community_in_digitalocean/70054_deploy_community_in_digitalocean.ascx" /></li>
</ul>
</li>
<li>Vultr
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Vultr/0002_workspace/0002_workspace.ascx" /></li>
</ul>
</li>
</li>
</ul>
</li>
<li><h6>Migrating to ONLYOFFICE Workspace Enterprise Edition</h6>

6
Web/Controls/Help/Installation/WorkspaceCommunity.ascx
View File

@ -65,13 +65,9 @@
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/ServerWindows/50016_install_community_edition/50016_install_community_edition.ascx" /></li>
</ul>
</li>
<li>DigitalOcean
<li>1-Click Apps
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/ServerDocker/70054_deploy_community_in_digitalocean/70054_deploy_community_in_digitalocean.ascx" /></li>
</ul>
</li>
<li>Vultr
<ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Vultr/0002_workspace/0002_workspace.ascx" /></li>
</ul>
</li>

2
Web/Controls/Help/Server/Vultr/DocsVultr/DocsVultr.ascx
View File

@ -36,7 +36,7 @@
<%--<div class="video_block">
<a onclick="showVideoContainer();" class="Vultr_oneclick_video"><span class="playbackbutton"></span></a>
</div>--%>
<p>Now you can easily deploy the Docker version of the <b>ONLYOFFICE Docs</b> in the <b>Vultr</b> infrastructure using a one-click app provided in the <b>Vultr Marketplace</b>.</p>
<p>Now you can easily deploy the Docker version of the <b>ONLYOFFICE Docs</b> in the <a target="_blank" href="https://www.vultr.com/marketplace/apps/onlyoffice-docs"><b>Vultr</b></a> infrastructure using a one-click app provided in the <b>Vultr Marketplace</b>.</p>
<p>The one-click app is an image that includes all the necessary pre-configured components to deploy ONLYOFFICE online editors on a <b>Vultr</b> server running under Ubuntu OS:</p>
<ul>
<li>Docker service,</li>

2
Web/Controls/Help/Server/Vultr/WorkspaceVultr/WorkspaceVultr.ascx
View File

@ -35,7 +35,7 @@
<%--<div class="video_block">
<a onclick="showVideoContainer();" class="Vultr_oneclick_video"><span class="playbackbutton"></span></a>
</div>--%>
<p>Now you can easily deploy the Docker version of the <b>ONLYOFFICE Workspace</b> in the <b>Vultr</b> infrastructure using a one-click app provided in the <b>Vultr Marketplace</b>.</p>
<p>Now you can easily deploy the Docker version of the <b>ONLYOFFICE Workspace</b> in the <a target="_blank" href="https://www.vultr.com/marketplace/apps/onlyoffice-workspace"><b>Vultr</b></a> infrastructure using a one-click app provided in the <b>Vultr Marketplace</b>.</p>
<p>The one-click app is an image that includes all the necessary pre-configured components to deploy your web office on a <b>Vultr</b> server running under Ubuntu OS:</p>
<ul>
<li>Docker service,</li>