From 81aa88af379982de5a287942e5b4bbd033fd572d Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Tue, 30 Jul 2024 09:23:51 +0200 Subject: [PATCH 01/10] 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 --- ALL_README.md | 1 + README.md | 4 ++-- README_es.md | 4 ++-- README_eu.md | 4 ++-- README_fr.md | 4 ++-- README_gl.md | 4 ++-- README_id.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 4 ++-- manifest.toml | 6 +++--- 9 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,5 @@ - [Irakurri README euskaraz](README_eu.md) - [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_zh_Hans.md) diff --git a/README.md b/README.md index 0a090fc..b0ad464 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Kimai2 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/kimai2.svg)](https://dash.yunohost.org/appci/app/kimai2) ![Working status](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/kimai2.svg)](https://ci-apps.yunohost.org/ci/apps/kimai2/) ![Working status](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) [![Install Kimai2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kimai2) @@ -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.18.0~ynh1 +**Shipped version:** 2.19.1~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index ff311e6..30e848b 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Kimai2 para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/kimai2.svg)](https://dash.yunohost.org/appci/app/kimai2) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/kimai2.svg)](https://ci-apps.yunohost.org/ci/apps/kimai2/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) [![Instalar Kimai2 con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kimai2) @@ -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.18.0~ynh1 +**Versión actual:** 2.19.1~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index a518814..9c0ac87 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Kimai2 YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/kimai2.svg)](https://dash.yunohost.org/appci/app/kimai2) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/kimai2.svg)](https://ci-apps.yunohost.org/ci/apps/kimai2/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) [![Instalatu Kimai2 YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kimai2) @@ -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.18.0~ynh1 +**Paketatutako bertsioa:** 2.19.1~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 1a805b5..07909e2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Kimai2 pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/kimai2.svg)](https://dash.yunohost.org/appci/app/kimai2) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/kimai2.svg)](https://ci-apps.yunohost.org/ci/apps/kimai2/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) [![Installer Kimai2 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kimai2) @@ -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.18.0~ynh1 +**Version incluse :** 2.19.1~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 38ff3f8..1136125 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Kimai2 para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/kimai2.svg)](https://dash.yunohost.org/appci/app/kimai2) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/kimai2.svg)](https://ci-apps.yunohost.org/ci/apps/kimai2/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) [![Instalar Kimai2 con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kimai2) @@ -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.18.0~ynh1 +**Versión proporcionada:** 2.19.1~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..392dda5 --- /dev/null +++ b/README_id.md @@ -0,0 +1,50 @@ + + +# Kimai2 untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/kimai2.svg)](https://ci-apps.yunohost.org/ci/apps/kimai2/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) + +[![Pasang Kimai2 dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kimai2) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Kimai2 secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +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~ynh1 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada Kimai2](./doc/screenshots/screenshot1.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/kimai2_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/kimai2_ynh/tree/testing --debug +atau +sudo yunohost app upgrade kimai2 -u https://github.com/YunoHost-Apps/kimai2_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 6b59204..58b5993 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Kimai2 -[![集成程度](https://dash.yunohost.org/integration/kimai2.svg)](https://dash.yunohost.org/appci/app/kimai2) ![工作状态](https://ci-apps.yunohost.org/ci/badges/kimai2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/kimai2.maintain.svg) +[![集成程度](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) [![使用 YunoHost 安装 Kimai2](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kimai2) @@ -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.18.0~ynh1 +**分发版本：** 2.19.1~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index bbc43d8..8a4fc9c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,7 @@ 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.18.0~ynh1" +version = "2.19.1~ynh1" maintainers = [] @@ -55,8 +55,8 @@ ram.runtime = "80M" [resources] [resources.sources.main] - url = "https://github.com/kevinpapst/kimai2/archive/refs/tags/2.18.0.tar.gz" - sha256 = "e6a0982470665c6b08c25117b0da621f1ad0ce5cc9a3f07c4e63361a38b9cd56" + url = "https://github.com/kevinpapst/kimai2/archive/refs/tags/2.19.1.tar.gz" + sha256 = "d3e3a50518fef5aeb26982b2436c9c69c2a3454978a026852cd3533e7670118d" autoupdate.strategy = "latest_github_tag" From dd31b63e78bb72306f20a509022c8f1c96a85a3e Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Tue, 30 Jul 2024 02:24:34 -0500 Subject: [PATCH 02/10] Update manifest.toml (#107) Upgrade php to v8.3 --- manifest.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8a4fc9c..c8d942d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -77,17 +77,17 @@ ram.runtime = "80M" [resources.apt] packages = [ - "php8.2-gd", - "php8.2-intl", - "php8.2-json", - "php8.2-mbstring", - "php8.2-pdo", - "php8.2-zip", - "php8.2-xml", - "php8.2-xsl", - "php8.2-ldap", - "php8.2-mysql", - "php8.2-sqlite3", + "php8.3-gd", + "php8.3-intl", + "php8.3-json", + "php8.3-mbstring", + "php8.3-pdo", + "php8.3-zip", + "php8.3-xml", + "php8.3-xsl", + "php8.3-ldap", + "php8.3-mysql", + "php8.3-sqlite3", "mariadb-server", ] From 505c327343ea9cd81922dd38bf74de615e9efd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:25:43 +0200 Subject: [PATCH 03/10] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c8d942d..d6cf16a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,7 @@ 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~ynh1" +version = "2.19.1~ynh2" maintainers = [] From d6e5fcc4a27d20d8764f493d029131e4ad754c0c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 30 Jul 2024 07:25:48 +0000 Subject: [PATCH 04/10] Auto-update READMEs --- 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 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b0ad464..3c2431e 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~ynh1 +**Shipped version:** 2.19.1~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index 30e848b..ffbcbbe 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~ynh1 +**Versión actual:** 2.19.1~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 9c0ac87..cae1857 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~ynh1 +**Paketatutako bertsioa:** 2.19.1~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 07909e2..7f4d083 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~ynh1 +**Version incluse :** 2.19.1~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index 1136125..13069bf 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~ynh1 +**Versión proporcionada:** 2.19.1~ynh2 **Demo:** diff --git a/README_id.md b/README_id.md index 392dda5..3bf1dfe 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~ynh1 +**Versi terkirim:** 2.19.1~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 58b5993..58addb0 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~ynh1 +**分发版本：** 2.19.1~ynh2 **演示：** From 3e630a5c544ccf35890bd00bc4a0a7f9e664134e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:26:43 +0200 Subject: [PATCH 05/10] Update backup --- scripts/backup | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/backup b/scripts/backup index c900e22..e40fc73 100755 --- a/scripts/backup +++ b/scripts/backup @@ -32,11 +32,12 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # BACKUP THE MYSQL DATABASE #================================================= +#================================================= +# BACKUP THE MYSQL DATABASE +#================================================= +ynh_print_info --message="Backing up the MySQL database..." -if [ "$database" = "mysql" ]; then - ynh_print_info --message="Backing up the MySQL database..." - ynh_mysql_dump_db --database="$db_name" > db.sql -fi +ynh_mysql_dump_db --database="$db_name" > db.sql #================================================= # END OF SCRIPT From b002f323f1cd8dc768bbc24a930b3607a70c5e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:30:11 +0200 Subject: [PATCH 06/10] cleaning --- scripts/backup | 3 --- scripts/install | 3 --- scripts/restore | 7 +++---- scripts/upgrade | 9 --------- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/scripts/backup b/scripts/backup index e40fc73..30f2c81 100755 --- a/scripts/backup +++ b/scripts/backup @@ -29,9 +29,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# BACKUP THE MYSQL DATABASE -#================================================= #================================================= # BACKUP THE MYSQL DATABASE #================================================= diff --git a/scripts/install b/scripts/install index d830cb7..4dc5cd0 100755 --- a/scripts/install +++ b/scripts/install @@ -13,9 +13,6 @@ source /usr/share/yunohost/helpers # INITIALIZE AND STORE SETTINGS #================================================= -database="mysql" -ynh_app_setting_set --app="$app" --key=database --value="$database" - random_key=$(ynh_string_random --length=32) ynh_app_setting_set --app="$app" --key=random_key --value="$random_key" diff --git a/scripts/restore b/scripts/restore index ff226f6..7dfd110 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,10 +27,9 @@ setfacl -R -m g:"www-data":rwX -m u:"$app":rwX "$install_dir/var/" #================================================= # RESTORE THE MYSQL DATABASE #================================================= -if [ "$database" = "mysql" ]; then - ynh_script_progression --message="Restoring the MySQL database..." --weight=1 - ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql -fi +ynh_script_progression --message="Restoring the MySQL database..." --weight=1 + +ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql #================================================= # RESTORE SYSTEM CONFIGURATIONS diff --git a/scripts/upgrade b/scripts/upgrade index 8d41640..98fa655 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,15 +14,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -if [ "$database" == "sqlite" ]; then - ynh_script_progression --message="Sqlite is not supported by Kimai2 anymore..." - ynh_script_progression --message="Kimai2 will be upgraded to last available version : 1.13" - if ynh_compare_current_package_version --comparison ge --version 1.17.1~ynh1; then - ynh_script_progression --message="Kimai2 sqlite version is already to the last available version, no upgrade will be made" - ynh_die --message="" 0 - fi -fi - if [ -z "${registration:-}" ]; then registration=0 ynh_app_setting_set --app="$app" --key=registration --value="$registration" From 606299e774b645210bbdbca9bd8d307b71e95afb Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 5 Aug 2024 08:25:52 +0200 Subject: [PATCH 07/10] 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 --- 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 | 6 +++--- 8 files changed, 10 insertions(+), 10 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..af96a97 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,7 @@ 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 +55,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" From 1d2cb9d207f0c6b4beacf45b956bb404b5ad2ca8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 5 Aug 2024 06:26:52 +0000 Subject: [PATCH 08/10] Auto-update READMEs --- 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 -- 7 files changed, 14 deletions(-) diff --git a/README.md b/README.md index 01ea3a0..0c736d2 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,8 @@ 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.20.1~ynh1 - **Demo:** ## Screenshots diff --git a/README_es.md b/README_es.md index ed08e84..4284f68 100644 --- a/README_es.md +++ b/README_es.md @@ -19,10 +19,8 @@ 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.20.1~ynh1 - **Demo:** ## Capturas diff --git a/README_eu.md b/README_eu.md index f76a2dc..e2d6f3f 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,10 +19,8 @@ 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.20.1~ynh1 - **Demoa:** ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index c8c09de..815d01f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,10 +19,8 @@ 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.20.1~ynh1 - **Démo :** ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index a0e1748..f1b3e23 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,10 +19,8 @@ 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.20.1~ynh1 - **Demo:** ## Capturas de pantalla diff --git a/README_id.md b/README_id.md index 736ed02..cb8fb36 100644 --- a/README_id.md +++ b/README_id.md @@ -19,10 +19,8 @@ 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.20.1~ynh1 - **Demo:** ## Tangkapan Layar diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 2875bd0..9a29020 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,10 +19,8 @@ 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 - **演示：** ## 截图 From 01155ad48fe3eb3e158f8952d02efa3833d9e5ee Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Sun, 11 Aug 2024 01:52:59 -0500 Subject: [PATCH 09/10] Keep logs and plugins (#114) * Update upgrade Update files to keep during upgrade * Update manifest.toml Update APT sources --- manifest.toml | 4 ++-- scripts/upgrade | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4fb9237..04e3ece 100644 --- a/manifest.toml +++ b/manifest.toml @@ -84,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 39e5d8302953121894207718d80338f5d59a1fdd Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 2 Sep 2024 09:05:44 +0200 Subject: [PATCH 10/10] Upgrade to v2.21.0 (#116) * Upgrade sources - `main` v2.21.0: https://github.com/kevinpapst/kimai2/releases/tag/2.21.0 * Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_ru.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- manifest.toml | 6 +++--- 10 files changed, 61 insertions(+), 10 deletions(-) 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.md b/README.md index 0c736d2..cb1703b 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.20.1~ynh1 +**Shipped version:** 2.21.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 4284f68..2e8687e 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.20.1~ynh1 +**Versión actual:** 2.21.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index e2d6f3f..9f304e3 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.20.1~ynh1 +**Paketatutako bertsioa:** 2.21.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 815d01f..31236ae 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.20.1~ynh1 +**Version incluse :** 2.21.0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index f1b3e23..15d39ee 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.20.1~ynh1 +**Versión proporcionada:** 2.21.0~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index cb8fb36..ba41f1d 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.20.1~ynh1 +**Versi terkirim:** 2.21.0~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..2ab70f9 --- /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.21.0~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 +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 9a29020..64156de 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.20.1~ynh1 +**分发版本：** 2.21.0~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 04e3ece..0457033 100644 --- a/manifest.toml +++ b/manifest.toml @@ -10,7 +10,7 @@ description.de = "Eine web-basierte Mehrbenutzer-Zeiterfassung mit Rechnungsdruc description.cs = "Víceuživatelská webová aplikace pro sledování času s podporou mobilních zařízení" -version = "2.20.1~ynh1" +version = "2.21.0~ynh1" maintainers = [] @@ -57,8 +57,8 @@ ram.runtime = "80M" [resources] [resources.sources.main] - url = "https://github.com/kevinpapst/kimai2/archive/refs/tags/2.20.1.tar.gz" - sha256 = "4bdeafaed831061c6981cb8059a9458564cde6ea8a49e359edbb3b41ebbdbbb3" + url = "https://github.com/kevinpapst/kimai2/archive/refs/tags/2.21.0.tar.gz" + sha256 = "f6da56211d392d5749d3e56d242f529d03b2fc1b803d33d642b5e0097281b05f" autoupdate.strategy = "latest_github_tag"