From 3045ecb0bae4dba2a292af5811e05e4deb43e62e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Feb 2024 19:34:23 +0100 Subject: [PATCH 1/2] Upgrade to v2.11.0 (#86) (#87) * Upgrade to v2.11.0 * Auto-update README Co-authored-by: YunoHost Bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6ca25e2..f17358c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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.0.33~ynh2 +**Shipped version:** 2.11.0~ynh1 **Demo:** https://www.kimai.org/demo/ diff --git a/README_fr.md b/README_fr.md index 38705d2..b3b4e70 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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.0.33~ynh2 +**Version incluse :** 2.11.0~ynh1 **Démo :** https://www.kimai.org/demo/ diff --git a/manifest.toml b/manifest.toml index 2c8277e..2df058a 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.0.33~ynh2" +version = "2.11.0~ynh1" maintainers = [""] @@ -52,8 +52,8 @@ ram.runtime = "80M" [resources] [resources.sources.main] - url = "https://github.com/kevinpapst/kimai2/archive/2.0.33.tar.gz" - sha256 = "9cad2555eb115711e100ca129c8152f3ec19ebfde6334a1ec5b7b2009b011959" + url = "https://github.com/kevinpapst/kimai2/archive/refs/tags/2.11.0.tar.gz" + sha256 = "428f149bd10f81d254e791caf0f68ebb16d67d146f357d47c38464a664100d4f" autoupdate.strategy = "latest_github_tag" From a74d77465ba453b2d45c4520410ff70fc71e8e6b Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:16:02 +0100 Subject: [PATCH 2/2] Testing (#88) * Upgrade to v2.11.0 (#86) * Upgrade to v2.11.0 * Auto-update README * Update manifest.toml * Update manifest.toml (#85) Add dedicated API permission * fix linter --------- Co-authored-by: YunoHost Bot Co-authored-by: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> --- manifest.toml | 9 ++++++++- scripts/install | 2 -- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2df058a..e5abba4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -25,8 +25,11 @@ cpe = "cpe:2.3:a:kimai:kimai_2" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = false + disk = "50M" ram.build = "500M" ram.runtime = "80M" @@ -63,10 +66,14 @@ ram.runtime = "80M" [resources.permissions] main.url = "/" + api.url = "/api" + api.show_tile = false + api.allowed = "visitors" + api.auth_header = false # Non-web, LDAP groups teamlead.allowed = "" admin.allowed = "admins" - super_admin.allowed = "" + super_admin.allowed = "admins" [resources.apt] packages = [ diff --git a/scripts/install b/scripts/install index cc885fe..d830cb7 100755 --- a/scripts/install +++ b/scripts/install @@ -19,8 +19,6 @@ 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" -ynh_permission_update -p "super_admin" --add "$admin" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #=================================================