Merge branch 'feature/compatibility-table' into release/1.0.0

This commit is contained in:
Svetlana Maleeva 2021-10-07 19:01:29 +03:00
commit 5ad2636828
3 changed files with 76 additions and 6 deletions

View File

@ -1,16 +1,19 @@
<%@ Control Language="C#" %>
<div class="notehelp nh_notice">Please note, that not all <b>ONLYOFFICE Groups</b> and <b>ONLYOFFICE Docs</b> versions can be connected to each other. In case you have <b>ONLYOFFICE Groups</b> version incompatible with the current <b>ONLYOFFICE Docs</b> version or vice versa, please consider upgrading to the latest versions or at least to the nearest compatible ones.</div>
<p>The table below shows which server versions can be connected to each other without any problems:</p>
<table class="table_versionlist">
<table class="table_versionlist new_versions">
<tbody>
<tr>
<th class="table_empty_cell"></th>
<th class="table_empty_cell"></th>
<th colspan="8" class="table_server">ONLYOFFICE Docs version</th>
<th colspan="11" class="table_server">ONLYOFFICE Docs version</th>
</tr>
<tr>
<th></th>
<th></th>
<th class="table_version016">6.4</th>
<th class="table_version015">6.3</th>
<th class="table_version014">6.2</th>
<th class="table_version013">6.1</th>
<th class="table_version012">6.0</th>
<th class="table_version011">5.5</th>
@ -21,7 +24,21 @@
<th class="table_version006">5.0</th>
</tr>
<tr>
<th rowspan="5" class="row_server"><span>ONLYOFFICE Community Server version</span></th>
<th rowspan="6" class="row_server"><span>ONLYOFFICE Community Server version</span></th>
<th class="table_version107">11.5</th>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
</tr>
<tr>
<th class="table_version107">10.0.1 &ndash; 11.0</th>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
@ -29,6 +46,9 @@
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
</tr>
@ -38,6 +58,9 @@
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="no"></span></td>
@ -49,6 +72,9 @@
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
@ -62,6 +88,9 @@
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
</tr>
@ -74,6 +103,9 @@
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="yes"></span></td>
</tr>
</tbody>

View File

@ -1,16 +1,19 @@
<%@ Control Language="C#" %>
<div class="notehelp nh_notice">Пожалуйста, обратите внимание, что не все версии <b>ONLYOFFICE Groups</b> и <b>ONLYOFFICE Docs</b> можно подключить друг к другу. Если ваша версия <b>ONLYOFFICE Groups</b> несовместима с текущей версией <b>ONLYOFFICE Docs</b> или наоборот, пожалуйста, рассмотрите возможность обновления до последних версий или хотя бы до ближайших совместимых.</div>
<p>В следующей таблице показано, какие серверные версии можно подключить друг к другу без проблем:</p>
<table class="table_versionlist">
<table class="table_versionlist new_versions">
<tbody>
<tr>
<th class="table_empty_cell"></th>
<th class="table_empty_cell"></th>
<th colspan="8" class="table_server">Версия ONLYOFFICE Docs</th>
<th colspan="11" class="table_server">Версия ONLYOFFICE Docs</th>
</tr>
<tr>
<th></th>
<th></th>
<th class="table_version016">6.4</th>
<th class="table_version015">6.3</th>
<th class="table_version014">6.2</th>
<th class="table_version013">6.1</th>
<th class="table_version012">6.0</th>
<th class="table_version011">5.5</th>
@ -21,7 +24,21 @@
<th class="table_version006">5.0</th>
</tr>
<tr>
<th rowspan="5" class="row_server"><span>Версия ONLYOFFICE Community Server</span></th>
<th rowspan="6" class="row_server"><span>Версия ONLYOFFICE Community Server</span></th>
<th class="table_version107">11.5</th>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
</tr>
<tr>
<th class="table_version107">10.0.1 &ndash; 11.0</th>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
@ -29,6 +46,9 @@
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
</tr>
@ -38,6 +58,9 @@
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="no"></span></td>
@ -49,6 +72,9 @@
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
@ -62,6 +88,9 @@
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="yes"></span></td>
<td><span class="yes"></span></td>
</tr>
@ -74,6 +103,9 @@
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="no"></span></td>
<td><span class="yes"></span></td>
</tr>
</tbody>

View File

@ -4058,6 +4058,12 @@ table.table_parameters {
}
}
&.new_versions {
td {
width: auto;
}
}
&.talk_pages {
td {
width: auto;