pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v7.4.0' of https://github.com/ONLYOFFICE/desktop-apps into release/v7.4.0

Browse Source
This commit is contained in:
maxkadushkin
2023-04-28 18:31:37 +03:00
parent e48b348097 1b4f959436
commit 62991341b3
15 changed files with 571 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
.github/workflows/init-changelogs.yaml vendored Normal file
View File

@ -0,0 +1,39 @@
name: Initialize changelog files
on: workflow_dispatch
jobs:
changelogs:
if: >-
${{ contains(github.ref, 'refs/heads/hotfix/v') ||
contains(github.ref, 'refs/heads/release/v') }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
token: ${{ secrets.PUSH_TOKEN }}
- name: Set version
run: |
REF="${{ github.ref }}"
echo "VERSION=${REF#*/v}" >> $GITHUB_ENV
- name: Create changelogs
run: |
CHANGES_WIN=win-linux/package/windows/update/changes
CHANGES_MAC=macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes
rm -rfv $CHANGES_WIN/$VERSION $CHANGES_MAC/$VERSION
cp -fRTv $CHANGES_WIN/0.0.0 $CHANGES_WIN/$VERSION
cp -fRTv $CHANGES_MAC/0.0.0 $CHANGES_MAC/$VERSION
find $CHANGES_WIN/$VERSION $CHANGES_MAC/$VERSION -name "*.html" -print \
-exec sed -e 's/0.0.0/'${VERSION}'/g' -e 's/000/'${VERSION//./}'/g' -i {} \;
- name: Commit changes
uses: EndBug/add-and-commit@v9
with:
author_name: github-actions[bot]
author_email: github-actions[bot]@users.noreply.github.com
message: Initialize changelogs for v${{ env.VERSION }}

38
.github/workflows/init-version.yaml vendored
View File

@ -1,38 +0,0 @@
name: Create changelog files
on: workflow_dispatch
jobs:
create-changelog:
if: >-
${{ contains(github.ref, 'refs/heads/hotfix/v') ||
contains(github.ref, 'refs/heads/release/v') }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
token: ${{ secrets.PUSH_TOKEN }}
- name: Set version
run: >-
echo "${{ github.ref_name }}" |
awk '{gsub(/.+\/v/,"version=");print;}' >> $GITHUB_ENV
- name: Create template changelogs
run: |
mkdir -pv win-linux/package/windows/update/changes/$version
echo "TODO" >> win-linux/package/windows/update/changes/$version/en.html
echo "TODO" >> win-linux/package/windows/update/changes/$version/ru.html
cp -rfv \
macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/template \
macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/$version
- name: Commit changes
uses: EndBug/add-and-commit@v8
with:
author_name: github-actions[bot]
author_email: github-actions[bot]@users.noreply.github.com
message: Create template changelogs for v${{ env.version }}

27
macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/template/ReleaseNotes.html → macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/0.0.0/changes.html
View File

@ -85,8 +85,10 @@
</head>
<body>
<div class="version">
<h1>ONLYOFFICE ?.?.?<span class="releasedate"> - [Date]</span></h1>
<h1>ONLYOFFICE 0.0.0<span class="releasedate"> - {{DATE}}</span></h1>
<h2>New Features</h2>
<h4>All Editors</h4>
<ul>
<li>TODO</li>
@ -103,7 +105,30 @@
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>
<h2>Fixes</h2>
<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>

27
macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/template/ReleaseNotesRU.html → macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/0.0.0/changes.ru.html
View File

@ -85,8 +85,10 @@
</head>
<body>
<div class="version">
<h1>ONLYOFFICE ?.?.?<span class="releasedate"> - [Дата]</span></h1>
<h1>ONLYOFFICE 0.0.0<span class="releasedate"> - {{DATE}}</span></h1>
<h2>Новые функции</h2>
<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
@ -103,7 +105,30 @@
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>
<h2>Исправления</h2>
<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>

30
macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4/ReleaseNotes.html → macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4.0/changes.html
View File

@ -85,24 +85,52 @@
</head>
<body>
<div class="version">
<h1>ONLYOFFICE 7.4<span class="releasedate"> - [Date]</span></h1>
<h1>ONLYOFFICE 7.4.0<span class="releasedate"> - {{DATE}}</span></h1>
<h2>New Features</h2>
<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>
<h2>Fixes</h2>
<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>
</div>
</body>

30
macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4/ReleaseNotesRU.html → macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4.0/changes.ru.html
View File

@ -85,24 +85,52 @@
</head>
<body>
<div class="version">
<h1>ONLYOFFICE 7.4<span class="releasedate"> - [Дата]</span></h1>
<h1>ONLYOFFICE 7.4.0<span class="releasedate"> - {{DATE}}</span></h1>
<h2>Новые функции</h2>
<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>
<h2>Исправления</h2>
<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>
</div>
</body>

7
win-linux/package/linux/deb/template/postinst.m4
View File

@ -34,8 +34,13 @@ if [ $(cat "$MIMEAPPS_LIST" | grep text/oform | wc -l) -eq "0" ]; then
echo "text/oform=M4_DESKTOPEDITORS_EXEC.desktop" >>"$MIMEAPPS_LIST"
fi
ifelse(M4_COMPANY_NAME, ONLYOFFICE,
xdg-mime install --mode system /opt/M4_DESKTOPEDITORS_PREFIX/mimetypes/onlyoffice-docxf.xml
xdg-mime install --mode system /opt/M4_DESKTOPEDITORS_PREFIX/mimetypes/onlyoffice-oform.xml
xdg-mime install --mode system /opt/M4_DESKTOPEDITORS_PREFIX/mimetypes/onlyoffice-oform.xml,
if [ -f /etc/astra_version ] && [ -f /etc/X11/trusted ]; then
sed -i '\|/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors|d' /etc/X11/trusted
echo '/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors(KBD_R)' >> /etc/X11/trusted
fi)
# Update cache of .desktop file MIME types. Non-fatal since it's just a cache.
#update-desktop-database > /dev/null 2>&1 || true

16
win-linux/package/linux/deb/template/postrm.m4
View File

@ -7,11 +7,21 @@ case "$1" in
purge)
ifelse(M4_COMPANY_NAME, ONLYOFFICE,
rm -fr /home/*/.local/share/M4_DESKTOPEDITORS_PREFIX,
rm -fr /home/*/.local/share/M4_PACKAGE_NAME)
rm -fr /home/*/.local/share/M4_PACKAGE_NAME
if [ -f /etc/astra_version ] && [ -f /etc/X11/trusted ]; then
sed -i '\|/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors|d' /etc/X11/trusted
fi)
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
:
remove)
ifelse(M4_COMPANY_NAME, ONLYOFFICE,:,
if [ -f /etc/astra_version ] && [ -f /etc/X11/trusted ]; then
sed -i '\|/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors|d' /etc/X11/trusted
fi)
;;
upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)
:
;;
*)

1
win-linux/package/windows/common.iss
View File

@ -968,6 +968,7 @@ Source: {#DEPLOY_PATH}\hunspell.dll; DestDir: {app}; Flags: s
Source: {#DEPLOY_PATH}\ooxmlsignature.dll; DestDir: {app}; Flags: signonce;
Source: {#DEPLOY_PATH}\converter\*.dll; DestDir: {app}\converter; Flags: signonce;
Source: {#DEPLOY_PATH}\converter\*.exe; DestDir: {app}\converter; Flags: signonce;
Source: ..\..\..\common\converter\package.config; DestDir: {app}\converter;
[InstallDelete]
Type: filesandordirs; Name: {app}\editors\sdkjs-plugins

100
win-linux/package/windows/update/changes/0.0.0/changes.html Normal file
View File

@ -0,0 +1,100 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>ONLYOFFICE Desktop Editors Release Notes</title>
<style type="text/css">
body {
background: white;
font-size: 12px;
font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif;
}
h1, h2, h3 {
color: #000000;
font-family: "Helvetica";
font-weight: normal;
font-style: normal;
}
h1 {
font-size: 18px;
}
h2 {
font-size: 16px;
}
h3 {
font-size: 14px;
}
a {
text-decoration: none;
}
code {
background: var(--color-gray-200);
font-family: monospace;
padding: 1px 5px;
}
.releasedate {
color: #888;
font-size: medium;
}
.version {
border-bottom: 1px solid #cfcfcf;
}
.more {
margin-bottom: 20px;
}
</style>
</head>
<body>
<div class="version">
<h1>ONLYOFFICE Desktop Editors 0.0.0<span class="releasedate"> - {{DATE}}</span></h1>
<h2>New Features</h2>
<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>
<h2>Fixes</h2>
<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>
<div class="more"><a href="https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md#000" target="_blank">and a little more...</a></div>
</div>
</body>
</html>

100
win-linux/package/windows/update/changes/0.0.0/changes_ru.html Normal file
View File

@ -0,0 +1,100 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>История изменений ONLYOFFICE Desktop Editors</title>
<style type="text/css">
body {
background: white;
font-size: 12px;
font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif;
}
h1, h2, h3 {
color: #000000;
font-family: "Helvetica";
font-weight: normal;
font-style: normal;
}
h1 {
font-size: 18px;
}
h2 {
font-size: 16px;
}
h3 {
font-size: 14px;
}
a {
text-decoration: none;
}
code {
background: var(--color-gray-200);
font-family: monospace;
padding: 1px 5px;
}
.releasedate {
color: #888;
font-size: medium;
}
.version {
border-bottom: 1px solid #cfcfcf;
}
.more {
margin-bottom: 20px;
}
</style>
</head>
<body>
<div class="version">
<h1>ONLYOFFICE Desktop Editors 0.0.0<span class="releasedate"> - {{DATE}}</span></h1>
<h2>Новые функции</h2>
<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>
<h2>Исправления</h2>
<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>
<div class="more"><a href="https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md#000" target="_blank">и прочее...</a></div>
</div>
</body>
</html>

101
win-linux/package/windows/update/changes/7.4.0/changes.html Normal file
View File

@ -0,0 +1,101 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>ONLYOFFICE Desktop Editors Release Notes</title>
<style type="text/css">
body {
background: white;
font-size: 12px;
font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif;
}
h1, h2, h3 {
color: #000000;
font-family: "Helvetica";
font-weight: normal;
font-style: normal;
}
h1 {
font-size: 18px;
}
h2 {
font-size: 16px;
}
h3 {
font-size: 14px;
}
a {
text-decoration: none;
}
code {
background: var(--color-gray-200);
font-family: monospace;
padding: 1px 5px;
}
.releasedate {
color: #888;
font-size: medium;
}
.version {
border-bottom: 1px solid #cfcfcf;
}
.more {
margin-bottom: 20px;
}
</style>
</head>
<body>
<div class="version">
<h1>ONLYOFFICE Desktop Editors 7.4.0<span class="releasedate"> - {{DATE}}</span></h1>
<h2>New Features</h2>
<h4>All Editors</h4>
<ul>
<li>Added document online templates</li>
<li>Support for scaling 250%+</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>
<h2>Fixes</h2>
<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>
<div class="more"><a href="https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md#740" target="_blank">and a little more...</a></div>
</div>
</body>
</html>

101
win-linux/package/windows/update/changes/7.4.0/changes_ru.html Normal file
View File

@ -0,0 +1,101 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>История изменений ONLYOFFICE Desktop Editors</title>
<style type="text/css">
body {
background: white;
font-size: 12px;
font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif;
}
h1, h2, h3 {
color: #000000;
font-family: "Helvetica";
font-weight: normal;
font-style: normal;
}
h1 {
font-size: 18px;
}
h2 {
font-size: 16px;
}
h3 {
font-size: 14px;
}
a {
text-decoration: none;
}
code {
background: var(--color-gray-200);
font-family: monospace;
padding: 1px 5px;
}
.releasedate {
color: #888;
font-size: medium;
}
.version {
border-bottom: 1px solid #cfcfcf;
}
.more {
margin-bottom: 20px;
}
</style>
</head>
<body>
<div class="version">
<h1>ONLYOFFICE Desktop Editors 7.4.0<span class="releasedate"> - {{DATE}}</span></h1>
<h2>Новые функции</h2>
<h4>Все редакторы</h4>
<ul>
<li>Панель с онлайн шаблонами документов</li>
<li>Поддержка системного масштаба 250%+</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>
<h2>Исправления</h2>
<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>
<div class="more"><a href="https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md#740" target="_blank">и многое другое...</a></div>
</div>
</body>
</html>

20
win-linux/package/windows/update/changes/7.4.0/en.html
View File

@ -1,20 +0,0 @@
<h2>New Features</h2>
<ul>
<li>Added document online templates</li>
<li>Support for scaling 250%+</li>
</ul>
<h4>Document Editor</h4>
<ul>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
</ul>
<h4>Presentation Editor</h4>
<ul>
</ul>
<h4>Forms</h4>
<ul>
</ul>
<h2>Fixes</h2>
<ul>
</ul>

20
win-linux/package/windows/update/changes/7.4.0/ru.html
View File

@ -1,20 +0,0 @@
<h2>Новые функции</h2>
<ul>
<li>Панель с онлайн шаблонами документов</li>
<li>Поддержка системного масштаба 250%+</li>
</ul>
<h4>Редактор документов</h4>
<ul>
</ul>
<h4>Редактор таблиц</h4>
<ul>
</ul>
<h4>Редактор презентаций</h4>
<ul>
</ul>
<h4>Формы</h4>
<ul>
</ul>
<h2>Исправления</h2>
<ul>
</ul>