diff --git a/.github/workflows/init-changelogs.yaml b/.github/workflows/init-changelogs.yaml
new file mode 100644
index 000000000..0a0650927
--- /dev/null
+++ b/.github/workflows/init-changelogs.yaml
@@ -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 }}
diff --git a/.github/workflows/init-version.yaml b/.github/workflows/init-version.yaml
deleted file mode 100644
index 79d9c6989..000000000
--- a/.github/workflows/init-version.yaml
+++ /dev/null
@@ -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 }}
diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/template/ReleaseNotes.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/0.0.0/changes.html
similarity index 83%
rename from macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/template/ReleaseNotes.html
rename to macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/0.0.0/changes.html
index 088a876bf..066424784 100644
--- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/template/ReleaseNotes.html
+++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/0.0.0/changes.html
@@ -85,8 +85,10 @@
-
ONLYOFFICE ?.?.? - [Date]
+
ONLYOFFICE 0.0.0 - {{DATE}}
+
New Features
+
All Editors
- TODO
@@ -103,7 +105,30 @@
+ Forms
+
+
Fixes
+
+ All Editors
+
+ Document Editor
+
+ Spreadsheet Editor
+
+ Presentation Editor
+
+ Forms
diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/template/ReleaseNotesRU.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/0.0.0/changes.ru.html
similarity index 82%
rename from macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/template/ReleaseNotesRU.html
rename to macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/0.0.0/changes.ru.html
index 3035bbba8..2f6058e28 100644
--- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/template/ReleaseNotesRU.html
+++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/0.0.0/changes.ru.html
@@ -85,8 +85,10 @@
-
ONLYOFFICE ?.?.? - [Дата]
+
ONLYOFFICE 0.0.0 - {{DATE}}
+
Новые функции
+
Все редакторы
- TODO
@@ -103,7 +105,30 @@
+ Формы
+
+
Исправления
+
+ Все редакторы
+
+ Редактор документов
+
+ Редактор таблиц
+
+ Редактор презентаций
+
+ Формы
diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4/ReleaseNotes.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4.0/changes.html
similarity index 80%
rename from macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4/ReleaseNotes.html
rename to macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4.0/changes.html
index 4e6fa207f..30a3273b0 100644
--- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4/ReleaseNotes.html
+++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4.0/changes.html
@@ -85,24 +85,52 @@
-
ONLYOFFICE 7.4 - [Date]
+
ONLYOFFICE 7.4.0 - {{DATE}}
+
New Features
+
+
All Editors
Document Editor
Spreadsheet Editor
Presentation Editor
Forms
+
Fixes
+
+
All Editors
+
Document Editor
+
+
Spreadsheet Editor
+
+
Presentation Editor
+
+
Forms
+
diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4/ReleaseNotesRU.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4.0/changes.ru.html
similarity index 79%
rename from macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4/ReleaseNotesRU.html
rename to macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4.0/changes.ru.html
index ca7f4331e..e9b4d16eb 100644
--- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4/ReleaseNotesRU.html
+++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.4.0/changes.ru.html
@@ -85,24 +85,52 @@
-
ONLYOFFICE 7.4 - [Дата]
+
ONLYOFFICE 7.4.0 - {{DATE}}
+
Новые функции
+
+
Все редакторы
Редактор документов
Редактор таблиц
Редактор презентаций
Формы
+
Исправления
+
+
Все редакторы
+
Редактор документов
+
+
Редактор таблиц
+
+
Редактор презентаций
+
+
Формы
+
diff --git a/win-linux/package/linux/deb/template/postinst.m4 b/win-linux/package/linux/deb/template/postinst.m4
index 340624f4d..b64430dc5 100644
--- a/win-linux/package/linux/deb/template/postinst.m4
+++ b/win-linux/package/linux/deb/template/postinst.m4
@@ -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
diff --git a/win-linux/package/linux/deb/template/postrm.m4 b/win-linux/package/linux/deb/template/postrm.m4
index fc4471219..f27e145bb 100644
--- a/win-linux/package/linux/deb/template/postrm.m4
+++ b/win-linux/package/linux/deb/template/postrm.m4
@@ -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)
+ :
;;
*)
diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss
index 4bdc4c308..1f84821da 100644
--- a/win-linux/package/windows/common.iss
+++ b/win-linux/package/windows/common.iss
@@ -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
diff --git a/win-linux/package/windows/update/changes/0.0.0/changes.html b/win-linux/package/windows/update/changes/0.0.0/changes.html
new file mode 100644
index 000000000..ce0023676
--- /dev/null
+++ b/win-linux/package/windows/update/changes/0.0.0/changes.html
@@ -0,0 +1,100 @@
+
+
+
+
+ ONLYOFFICE Desktop Editors Release Notes
+
+
+
+
+
ONLYOFFICE Desktop Editors 0.0.0 - {{DATE}}
+
+
New Features
+
+
All Editors
+
+
Document Editor
+
+
Spreadsheet Editor
+
+
Presentation Editor
+
+
Forms
+
+
+
Fixes
+
+
All Editors
+
+
Document Editor
+
+
Spreadsheet Editor
+
+
Presentation Editor
+
+
Forms
+
+
+
+
+
+
diff --git a/win-linux/package/windows/update/changes/0.0.0/changes_ru.html b/win-linux/package/windows/update/changes/0.0.0/changes_ru.html
new file mode 100644
index 000000000..d045e2eee
--- /dev/null
+++ b/win-linux/package/windows/update/changes/0.0.0/changes_ru.html
@@ -0,0 +1,100 @@
+
+
+
+
+ История изменений ONLYOFFICE Desktop Editors
+
+
+
+
+
ONLYOFFICE Desktop Editors 0.0.0 - {{DATE}}
+
+
Новые функции
+
+
Все редакторы
+
+
Редактор документов
+
+
Редактор таблиц
+
+
Редактор презентаций
+
+
Формы
+
+
+
Исправления
+
+
Все редакторы
+
+
Редактор документов
+
+
Редактор таблиц
+
+
Редактор презентаций
+
+
Формы
+
+
+
+
+
+
diff --git a/win-linux/package/windows/update/changes/7.4.0/changes.html b/win-linux/package/windows/update/changes/7.4.0/changes.html
new file mode 100644
index 000000000..d33b93e78
--- /dev/null
+++ b/win-linux/package/windows/update/changes/7.4.0/changes.html
@@ -0,0 +1,101 @@
+
+
+
+
+ ONLYOFFICE Desktop Editors Release Notes
+
+
+
+
+
ONLYOFFICE Desktop Editors 7.4.0 - {{DATE}}
+
+
New Features
+
+
All Editors
+
+ - Added document online templates
+ - Support for scaling 250%+
+
+
Document Editor
+
+
Spreadsheet Editor
+
+
Presentation Editor
+
+
Forms
+
+
+
Fixes
+
+
All Editors
+
+
Document Editor
+
+
Spreadsheet Editor
+
+
Presentation Editor
+
+
Forms
+
+
+
+
+
+
diff --git a/win-linux/package/windows/update/changes/7.4.0/changes_ru.html b/win-linux/package/windows/update/changes/7.4.0/changes_ru.html
new file mode 100644
index 000000000..fdf89e16d
--- /dev/null
+++ b/win-linux/package/windows/update/changes/7.4.0/changes_ru.html
@@ -0,0 +1,101 @@
+
+
+
+
+ История изменений ONLYOFFICE Desktop Editors
+
+
+
+
+
ONLYOFFICE Desktop Editors 7.4.0 - {{DATE}}
+
+
Новые функции
+
+
Все редакторы
+
+ - Панель с онлайн шаблонами документов
+ - Поддержка системного масштаба 250%+
+
+
Редактор документов
+
+
Редактор таблиц
+
+
Редактор презентаций
+
+
Формы
+
+
+
Исправления
+
+
Все редакторы
+
+
Редактор документов
+
+
Редактор таблиц
+
+
Редактор презентаций
+
+
Формы
+
+
+
+
+
+
diff --git a/win-linux/package/windows/update/changes/7.4.0/en.html b/win-linux/package/windows/update/changes/7.4.0/en.html
deleted file mode 100644
index 6fe3e54f0..000000000
--- a/win-linux/package/windows/update/changes/7.4.0/en.html
+++ /dev/null
@@ -1,20 +0,0 @@
-New Features
-
- - Added document online templates
- - Support for scaling 250%+
-
-Document Editor
-
-Spreadsheet Editor
-
-Presentation Editor
-
-Forms
-
-Fixes
-
\ No newline at end of file
diff --git a/win-linux/package/windows/update/changes/7.4.0/ru.html b/win-linux/package/windows/update/changes/7.4.0/ru.html
deleted file mode 100644
index 2d3c1bff3..000000000
--- a/win-linux/package/windows/update/changes/7.4.0/ru.html
+++ /dev/null
@@ -1,20 +0,0 @@
-Новые функции
-
- - Панель с онлайн шаблонами документов
- - Поддержка системного масштаба 250%+
-
-Редактор документов
-
-Редактор таблиц
-
-Редактор презентаций
-
-Формы
-
-Исправления
-