правки по десктопам
This commit is contained in:
alexandervnuchkov
parent
103615eb39
commit
3efbbc1c80
@ -23,7 +23,6 @@
|
||||
<ul class="TableOfContents">
|
||||
<li><span class="gs_link gs_active" id="all">All</span></li>
|
||||
<li><span class="gs_link" id="InstallationIssues">Installation issues</span></li>
|
||||
<li><span class="gs_link" id="ActivationIssues">Activation issues</span></li>
|
||||
</ul>
|
||||
|
||||
<%-- <div class="keyword_block">
|
||||
@ -41,12 +40,5 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="gs_content" id="ActivationIssues_block">
|
||||
<h2>Activation issues</h2>
|
||||
<div class="question_answer">
|
||||
<p><span>Q:</span>I cannot register the desktop editors with the key received after the purchase.</p>
|
||||
<p><span class="answer">A:</span>Since desktop editors have gone open source, you no longer need to activate them. Please download the latest version from <a target="_blank" href="http://www.onlyoffice.com/download-desktop.aspx">our website</a>, install and run it to be able to use the editors without any limitations.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
<ul class="TableOfContents">
|
||||
<li><span class="gs_link gs_active" id="all">Все</span></li>
|
||||
<li><span class="gs_link" id="InstallationIssues">Проблемы при установке</span></li>
|
||||
<li><span class="gs_link" id="ActivationIssues">Проблемы при активации</span></li>
|
||||
</ul>
|
||||
|
||||
<%-- <div class="keyword_block">
|
||||
@ -41,12 +40,4 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="gs_content" id="ActivationIssues_block">
|
||||
<h2>Проблемы при активации</h2>
|
||||
<div class="question_answer">
|
||||
<p><span>Вопрос:</span>Я не могу зарегистрировать десктопные редакторы с помощью ключа, полученного после покупки.</p>
|
||||
<p><span class="answer">Ответ:</span>Поскольку код десктопных редакторов стал открытым, активация больше не требуется. Пожалуйста, скачайте последнюю версию с <a target="_blank" href="http://www.onlyoffice.com/download-desktop.aspx">нашего сайта</a>, установите и запустите её, чтобы использовать редакторы без каких-либо ограничений.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
<%@ Control Language="C#" Inherits="BaseContentUserControls" %>
|
||||
|
||||
<p>Get the latest version of <b><%= ((BasePage)Page).EditionVersion %></b> source code from GitHub:</p>
|
||||
<pre><code>git clone --recursive https://github.com/ONLYOFFICE/<%= ((BasePage)Page).CommandName %>.git
|
||||
</code></pre>
|
||||
<p>Switch to the <b><%= ((BasePage)Page).EditionVersion %></b> directory:</p>
|
||||
<pre><code>cd <%= ((BasePage)Page).CommandName %>
|
||||
</code></pre>
|
||||
<p>Download and build third party modules:</p>
|
||||
<pre><code>cd core/Common/3dParty && ./make.sh
|
||||
</code></pre>
|
||||
<p>Now you need to build <b><%= ((BasePage)Page).EditionVersion %></b> components:</p>
|
||||
<ol>
|
||||
<li>Build <b>core</b>:
|
||||
<pre><code>cd ../.. && make
|
||||
</code></pre>
|
||||
</li>
|
||||
<li>Build <b>sdkjs</b>:
|
||||
<pre><code>cd ../sdkjs && make
|
||||
</code></pre>
|
||||
</li>
|
||||
<li class="documentserver_display">Build <b>server</b>:
|
||||
<pre><code>cd ../server && make
|
||||
</code></pre>
|
||||
</li>
|
||||
</ol>
|
||||
@ -0,0 +1,26 @@
|
||||
<%@ Control Language="C#" Inherits="BaseContentUserControls" %>
|
||||
|
||||
<p>Получите последнюю версию исходного кода <b class="documentserver_display">Сервера документов</b><b class="desktop_display">Десктопных редакторов</b> с GitHub:</p>
|
||||
<pre><code>git clone --recursive https://github.com/ONLYOFFICE/<%= ((BasePage)Page).CommandName %>.git
|
||||
</code></pre>
|
||||
<p>Перейдите в каталог <b class="documentserver_display">Сервера документов</b><b class="desktop_display">Десктопных редакторов</b>:</p>
|
||||
<pre><code>cd <%= ((BasePage)Page).CommandName %>
|
||||
</code></pre>
|
||||
<p>Скачайте и установите сторонние модули:</p>
|
||||
<pre><code>cd core/Common/3dParty && ./make.sh
|
||||
</code></pre>
|
||||
<p>Теперь надо собрать компоненты <b class="documentserver_display">Сервера документов</b><b class="desktop_display">Десктопных редакторов</b>:</p>
|
||||
<ol>
|
||||
<li>Соберите <b>core</b>:
|
||||
<pre><code>cd ../.. && make
|
||||
</code></pre>
|
||||
</li>
|
||||
<li>Соберите <b>sdkjs</b>:
|
||||
<pre><code>cd ../sdkjs && make
|
||||
</code></pre>
|
||||
</li>
|
||||
<li class="documentserver_display">Соберите <b>server</b>:
|
||||
<pre><code>cd ../server && make
|
||||
</code></pre>
|
||||
</li>
|
||||
</ol>
|
||||
@ -0,0 +1,43 @@
|
||||
<%@ Control Language="C#" Inherits="BaseContentUserControls"%>
|
||||
|
||||
<h2 id="Compiling">Installing dependencies</h2>
|
||||
<div class="block_of_step">
|
||||
<div class="screen_text">
|
||||
<p>Before you start the compilation, you need to install all the tools and dependencies necessary for the installation and build process. <b>Nodejs</b> is installed using the commands:</p>
|
||||
<pre><code>sudo apt-get install -yq curl apt-transport-https ca-certificates
|
||||
curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
|
||||
sudo apt-get install -y nodejs
|
||||
</code></pre>
|
||||
<div class="notehelp">
|
||||
You might also need to install <b>npm</b> and dependencies, depending on your version of Ubuntu. This can be done using the following command:
|
||||
<pre><code>sudo apt-get install npm
|
||||
</code></pre>
|
||||
</div>
|
||||
<p>After that update <b>npm</b> running the command:</p>
|
||||
<pre><code>sudo npm install -g npm
|
||||
</code></pre>
|
||||
<p>Install <b>grunt</b>:</p>
|
||||
<pre><code>sudo npm install -g grunt-cli
|
||||
</code></pre>
|
||||
<p>Most of the other dependencies can be installed using the single command:</p>
|
||||
<pre><code>sudo apt-get install --force-yes -yq \
|
||||
wget \
|
||||
build-essential \
|
||||
libcurl4-gnutls-dev \
|
||||
libglib2.0-dev \
|
||||
libgdk-pixbuf2.0-dev \
|
||||
libgtkglext1-dev \
|
||||
libatk1.0-dev \
|
||||
libcairo2-dev \
|
||||
libxml2-dev \
|
||||
libxss-dev \
|
||||
libgconf2-dev \
|
||||
default-jre \
|
||||
qt5-qmake \
|
||||
qt5-default \
|
||||
p7zip-full \
|
||||
git \
|
||||
subversion
|
||||
</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
@ -0,0 +1,43 @@
|
||||
<%@ Control Language="C#" Inherits="BaseContentUserControls" %>
|
||||
|
||||
<h2 id="Compiling">Установка зависимостей</h2>
|
||||
<div class="block_of_step">
|
||||
<div class="screen_text">
|
||||
<p>Перед тем как начать компиляцию, надо установить все инструменты и зависимости, необходимые для установки и сборки. <b>Nodejs</b> можно установить с помощью следующей команды:</p>
|
||||
<pre><code>sudo apt-get install -yq curl apt-transport-https ca-certificates
|
||||
curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
|
||||
sudo apt-get install -y nodejs
|
||||
</code></pre>
|
||||
<div class="notehelp">
|
||||
В зависимости от версии Ubuntu вам также может понадобиться установить <b>npm</b> с зависимостями. Это можно сделать с помощью следующей команды:
|
||||
<pre><code>sudo apt-get install npm
|
||||
</code></pre>
|
||||
</div>
|
||||
<p>После этого обновите <b>npm</b> командой:</p>
|
||||
<pre><code>sudo npm install -g npm
|
||||
</code></pre>
|
||||
<p>Установите <b>grunt</b>:</p>
|
||||
<pre><code>sudo npm install -g grunt-cli
|
||||
</code></pre>
|
||||
<p>Большую часть остальных зависимостей можно установить одной командой:</p>
|
||||
<pre><code>sudo apt-get install --force-yes -yq \
|
||||
wget \
|
||||
build-essential \
|
||||
libcurl4-gnutls-dev \
|
||||
libglib2.0-dev \
|
||||
libgdk-pixbuf2.0-dev \
|
||||
libgtkglext1-dev \
|
||||
libatk1.0-dev \
|
||||
libcairo2-dev \
|
||||
libxml2-dev \
|
||||
libxss-dev \
|
||||
libgconf2-dev \
|
||||
default-jre \
|
||||
qt5-qmake \
|
||||
qt5-default \
|
||||
p7zip-full \
|
||||
git \
|
||||
subversion
|
||||
</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
@ -1,4 +1,4 @@
|
||||
<%@ Control Language="C#" Inherits="BaseContentUserControls" %>
|
||||
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
|
||||
<a class="page_version_link" target="_blank" href="https://github.com/ONLYOFFICE/DesktopEditors"><cc:localizecontent runat="Server" controlname="~/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditorsProduct.ascx" /><span class="pvl_version pvl_current">v.4.2</span></a>
|
||||
<a class="page_version_link" target="_blank" href="https://github.com/ONLYOFFICE/DesktopEditors"><cc:localizecontent runat="Server" controlname="~/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditorsProduct.ascx" /><span class="pvl_version pvl_current">v.4.3</span></a>
|
||||
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/Changelogs/DesktopEditorsChangelog.ascx" />
|
||||
22
Web/desktop/documents/linux/compile-desktop-ubuntu.aspx
Normal file
22
Web/desktop/documents/linux/compile-desktop-ubuntu.aspx
Normal file
@ -0,0 +1,22 @@
|
||||
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/Desktop/DesktopArticles.master" %>
|
||||
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
|
||||
<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
|
||||
<body class="desktop_linux_version desktop_editors">
|
||||
</asp:Content>
|
||||
<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
|
||||
<cc:LocalizeContent ID="LocalizeContent2" runat="Server" ControlName="~/Controls/Help/VariousControls/TopControls/DesktopDocumentsTop/DesktopDocumentsTop.ascx" />
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
|
||||
<% ((BasePage)Page).EditionVersion = "Desktop Editors"; %>
|
||||
<% ((BasePage)Page).CommandName = "DesktopEditors"; %>
|
||||
<cc:LocalizeContent ID="LocalizeContent1" runat="Server" ControlName="~/Controls/Help/Desktop/Documents/Linux/DesktopLinuxCompile/DesktopLinuxCompile.ascx" />
|
||||
</asp:Content>
|
||||
<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
|
||||
<div class="guidespage document">
|
||||
<div id="SeeAlsoBlockLinks">
|
||||
<div class="caption guides">
|
||||
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Desktop/100003_linux_system_requirements/100003_linux_system_requirements.ascx" />
|
||||
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Desktop/100006_troubleshooting/100006_troubleshooting.ascx" />
|
||||
</div>
|
||||
</div>
|
||||
</asp:Content>
|
||||
22
Web/desktop/documents/windows/compile-desktop-windows.aspx
Normal file
22
Web/desktop/documents/windows/compile-desktop-windows.aspx
Normal file
@ -0,0 +1,22 @@
|
||||
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/Desktop/DesktopArticles.master" %>
|
||||
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
|
||||
<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
|
||||
<body class="desktop_windows_version desktop_editors">
|
||||
</asp:Content>
|
||||
<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
|
||||
<cc:LocalizeContent ID="LocalizeContent2" runat="Server" ControlName="~/Controls/Help/VariousControls/TopControls/DesktopDocumentsTop/DesktopDocumentsTop.ascx" />
|
||||
</asp:Content>
|
||||
<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
|
||||
<% ((BasePage)Page).EditionVersion = "Desktop Editors"; %>
|
||||
<% ((BasePage)Page).CommandName = "DesktopEditors"; %>
|
||||
<cc:LocalizeContent ID="LocalizeContent1" runat="Server" ControlName="~/Controls/Help/Desktop/Documents/Windows/DesktopWindowsCompile/DesktopWindowsCompile.ascx" />
|
||||
</asp:Content>
|
||||
<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
|
||||
<div class="guidespage document">
|
||||
<div id="SeeAlsoBlockLinks">
|
||||
<div class="caption guides">
|
||||
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Desktop/100001_windows_system_requirements/100001_windows_system_requirements.ascx" />
|
||||
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Desktop/100006_troubleshooting/100006_troubleshooting.ascx" />
|
||||
</div>
|
||||
</div>
|
||||
</asp:Content>
|
||||
Loading…
Reference in New Issue
Block a user