From 15cbaa3b30889d5df6f1469be24c8ab7e6d54d19 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 24 Aug 2024 19:08:15 +0200 Subject: [PATCH 1/2] Testing (#113) * Upgrade to v2.19.1 (#109) * Upgrade sources - `main` v2.19.1: https://github.com/kevinpapst/kimai2/releases/tag/2.19.1 * Auto-update READMEs * Update manifest.toml (#107) Upgrade php to v8.3 * Update manifest.toml * Auto-update READMEs * Update backup * cleaning * Upgrade to v2.20.1 (#112) * Upgrade sources - `main` v2.20.1: https://github.com/kevinpapst/kimai2/releases/tag/2.20.1 * Auto-update READMEs * Auto-update READMEs * Keep logs and plugins (#114) * Update upgrade Update files to keep during upgrade * Update manifest.toml Update APT sources --------- Co-authored-by: YunoHost Bot Co-authored-by: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Co-authored-by: yunohost-bot --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_zh_Hans.md | 2 +- manifest.toml | 12 +++++++----- scripts/upgrade | 7 +++---- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 3c2431e..0c736d2 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Shipped version:** 2.19.1~ynh2 +**Shipped version:** 2.20.1~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index ffbcbbe..4284f68 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Versión actual:** 2.19.1~ynh2 +**Versión actual:** 2.20.1~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index cae1857..e2d6f3f 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Paketatutako bertsioa:** 2.19.1~ynh2 +**Paketatutako bertsioa:** 2.20.1~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 7f4d083..815d01f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Version incluse :** 2.19.1~ynh2 +**Version incluse :** 2.20.1~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 13069bf..f1b3e23 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Versión proporcionada:** 2.19.1~ynh2 +**Versión proporcionada:** 2.20.1~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 3bf1dfe..cb8fb36 100644 --- a/README_id.md +++ b/README_id.md @@ -19,7 +19,7 @@ Ini TIDAK boleh diedit dengan tangan. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Versi terkirim:** 2.19.1~ynh2 +**Versi terkirim:** 2.20.1~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 58addb0..9a29020 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**分发版本：** 2.19.1~ynh2 +**分发版本：** 2.20.1~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index d6cf16a..04e3ece 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,9 @@ description.fr = "Application multi-utilisateurs de suivi du temps compatible av description.de = "Eine web-basierte Mehrbenutzer-Zeiterfassung mit Rechnungsdruck mit Unterstützung für mobile Endgeräte" description.cs = "Víceuživatelská webová aplikace pro sledování času s podporou mobilních zařízení" -version = "2.19.1~ynh2" + +version = "2.20.1~ynh1" + maintainers = [] @@ -55,8 +57,8 @@ ram.runtime = "80M" [resources] [resources.sources.main] - url = "https://github.com/kevinpapst/kimai2/archive/refs/tags/2.19.1.tar.gz" - sha256 = "d3e3a50518fef5aeb26982b2436c9c69c2a3454978a026852cd3533e7670118d" + url = "https://github.com/kevinpapst/kimai2/archive/refs/tags/2.20.1.tar.gz" + sha256 = "4bdeafaed831061c6981cb8059a9458564cde6ea8a49e359edbb3b41ebbdbbb3" autoupdate.strategy = "latest_github_tag" @@ -82,12 +84,12 @@ ram.runtime = "80M" "php8.3-json", "php8.3-mbstring", "php8.3-pdo", - "php8.3-zip", + "php8.3-tokenizer", "php8.3-xml", + "php8.3-zip", "php8.3-xsl", "php8.3-ldap", "php8.3-mysql", - "php8.3-sqlite3", "mariadb-server", ] diff --git a/scripts/upgrade b/scripts/upgrade index 98fa655..a90a198 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,12 +28,11 @@ if ynh_compare_current_package_version --comparison le --version 1.30.0~ynh1; th ynh_script_progression --message="Doing a hard cache flush for major Kimai 2 update from version 1.x to 2.x" # Download, check integrity, uncompress and patch the source from app.src - # Remove local.yaml as recommended for major version upgrade https://github.com/kimai/kimai/blob/main/UPGRADING.md - # As a full_replace (see https://www.kimai.org/documentation/updates.html) is performed keep .env file - ynh_setup_source --dest_dir="$install_dir" --keep=".env var/invoices/ var/data/" --full_replace=1 + # Remove var/cache/* and var/plugins/* as recommended for major version upgrade https://github.com/kimai/kimai/blob/main/UPGRADING.md + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env var/data/ var/invoices/ var/log/" else # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config/packages/local.yaml var/invoices/ var/data/" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env var/cache/ var/data/ var/invoices/ var/log/ var/plugins/ " fi chmod 750 "$install_dir" From c9174065d7fe1d2af70bbcc78ac1bc58db717756 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 24 Aug 2024 17:08:19 +0000 Subject: [PATCH 2/2] Auto-update READMEs --- ALL_README.md | 1 + README_ru.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 README_ru.md diff --git a/ALL_README.md b/ALL_README.md index 4ed64dd..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -6,4 +6,5 @@ - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) - [Baca README dalam bahasa bahasa Indonesia](README_id.md) +- [Прочитать README на русский](README_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..0662729 --- /dev/null +++ b/README_ru.md @@ -0,0 +1,50 @@ + + +# Kimai2 для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/kimai2.svg)](https://ci-apps.yunohost.org/ci/apps/kimai2/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) + +[![Установите Kimai2 с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kimai2) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить Kimai2 быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). + + +**Поставляемая версия:** 2.20.1~ynh1 + +**Демо-версия:** + +## Снимки экрана + +![Снимок экрана Kimai2](./doc/screenshots/screenshot1.png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация администратора: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/kimai2_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/kimai2_ynh/tree/testing --debug +или +sudo yunohost app upgrade kimai2 -u https://github.com/YunoHost-Apps/kimai2_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:**