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

Merge branch 'master' of https://github.com/ONLYOFFICE/helpcenter

Browse Source
This commit is contained in:
alexandervnuchkov 2018-07-13 14:10:22 +03:00
commit cb8d5e7d5b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Web/Controls/Help/Desktop/Documents/Windows/DesktopWindowsCompile/DesktopWindowsCompile.ascx
View File

@ -24,7 +24,7 @@
<li>7z</li>
<li>Git for Windows</li>
<li>Microsoft Visual Studio 2015 Community</li>
<li>Microsoft Windows SDK 8.1</li>
<li>Microsoft Windows SDK 10 (10.0.14393)</li>
<li>Qt 5.8</li>
<li>PowerShell 4</li>
<li>Node.js</li>
@ -37,7 +37,7 @@
<div class="screen_text">
<h5>Getting the source code</h5>
<p>Run the Windows command line tool, create the folder for the project and checkout the project from the GitHub:</p>
<pre><code>mkdir C:\GIT\DesktopEditors
<pre><code>mkdir C:\GIT\
cd C:\GIT\
git clone --recursive https://github.com/ONLYOFFICE/DesktopEditors.git</code></pre>
<h5>Build the third-party core components</h5>
@ -45,17 +45,18 @@ git clone --recursive https://github.com/ONLYOFFICE/DesktopEditors.git</code></p
<pre><code>C:\GIT\DesktopEditors\core\Common\3dParty\make.bat</code></pre>
<h5>Build Qt components</h5>
<p>Now build the Qt-based components and libraries using the Qt compiler installed. This is done using the following Qt project files:</p>
<pre><code>C:\GIT\DesktopEditors\core\X2tConverter\build\Qt\X2tSLN.pro
C:\GIT\DesktopEditors\core\UnicodeConverter\UnicodeConverter.pro
<pre><code>C:\GIT\DesktopEditors\core\UnicodeConverter\UnicodeConverter.pro
C:\GIT\DesktopEditors\core\PdfWriter\PdfWriter.pro
C:\GIT\DesktopEditors\core\DjVuFile\DjVuFile.pro
C:\GIT\DesktopEditors\core\XpsFile\XpsFile.pro
C:\GIT\DesktopEditors\core\DesktopEditor\doctrenderer\doctrenderer.pro
C:\GIT\DesktopEditors\core\HtmlRenderer\htmlrenderer.pro
C:\GIT\DesktopEditors\core\PdfReader\PdfReader.pro
C:\GIT\DesktopEditors\core\DjVuFile\DjVuFile.pro
C:\GIT\DesktopEditors\core\XpsFile\XpsFile.pro
C:\GIT\DesktopEditors\core\HtmlFile\HtmlFile.pro
C:\GIT\DesktopEditors\core\DesktopEditor\doctrenderer\doctrenderer.pro
C:\GIT\DesktopEditors\core\X2tConverter\build\Qt\X2tSLN.pro
C:\GIT\DesktopEditors\desktop-sdk\HtmlFile\Internal\Internal.pro</code></pre>
C:\GIT\DesktopEditors\desktop-sdk\HtmlFile\Internal\Internal.pro
C:\GIT\DesktopEditors\core\DesktopEditor\hunspell-1.3.3\src\qt\hunspell.pro
C:\GIT\DesktopEditors\corecore\DesktopEditor\xmlsec\src\ooxmlsignature.pro</code></pre>
<h5>Build core and application</h5>
<p>Now you can build the desktop application core components and the application itself. The desktop core is built with the Qt project file:</p>
<pre><code>C:\GIT\DesktopEditors\desktop-sdk\ChromiumBasedEditors\lib\AscDocumentsCore_win.pro</code></pre>

1
Web/Controls/Help/Server/Linux/Document/LinuxInstallationCentOS/LinuxInstallationCentOS.ru.ascx
View File

@ -140,7 +140,6 @@ sudo chkconfig postgresql on
<pre><code>cd /tmp</code></pre>
<p>для предотвращения ситуации, когда при запуске от имени суперпользователя выдаётся сообщение <code>could not change directory to "/root"</code>. После этого необходимо создать базу данных и пользователя:</p>
<pre><code>sudo -u postgres psql -c "CREATE DATABASE onlyoffice;"
sudo -u postgres psql -c "CREATE DATABASE onlyoffice;"
sudo -u postgres psql -c "CREATE USER onlyoffice WITH password 'onlyoffice';"
sudo -u postgres psql -c "GRANT ALL privileges ON DATABASE onlyoffice TO onlyoffice;"</code></pre>
<h5>Установка Redis</h5>