From b73c7e4485e44c27466bbb0ba115603bf390a189 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 23 Jan 2022 22:03:51 +0100 Subject: [PATCH] Upgrade to 1.13~ynh1 --- README.md | 2 +- README_fr.md | 2 +- conf/.env.mysql | 4 +++- conf/.env.sqlite | 6 ++++-- conf/app.src | 4 ++-- manifest.json | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e0db6d6..2be2ca0 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This is the reloaded version of the open source timetracker Kimai. Right now its 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:** 1.17~ynh1 +**Shipped version:** 1.13~ynh1 **Demo:** https://www.kimai.org/demo/ diff --git a/README_fr.md b/README_fr.md index acfdf96..7e239a1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ This is the reloaded version of the open source timetracker Kimai. Right now its 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 :** 1.17~ynh1 +**Version incluse :** 1.13~ynh1 **Démo :** https://www.kimai.org/demo/ diff --git a/conf/.env.mysql b/conf/.env.mysql index 3b934cc..2a53aaf 100644 --- a/conf/.env.mysql +++ b/conf/.env.mysql @@ -11,8 +11,10 @@ APP_SECRET=__RANDOM_KEY__ ###> doctrine/doctrine-bundle ### # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url +# For a MySQL database, use: "mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=10.2.12&charset=utf8" +# For a MariaDB database, use: "mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=mariadb-10.2.12" # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data/kimai.sqlite" -# Configure your db driver and server_version in config/packages/doctrine.yaml +# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml DATABASE_URL=mysql://__DB_USER__:__DB_PWD__@127.0.0.1:3306/__DB_NAME__ # DATABASE_URL=sqlite:///%kernel.project_dir%/var/data/kimai.sqlite ###< doctrine/doctrine-bundle ### diff --git a/conf/.env.sqlite b/conf/.env.sqlite index c584325..c708414 100644 --- a/conf/.env.sqlite +++ b/conf/.env.sqlite @@ -11,9 +11,11 @@ APP_SECRET=__RANDOM_KEY__ ###> doctrine/doctrine-bundle ### # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url +# For a MySQL database, use: "mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=10.2.12&charset=utf8" +# For a MariaDB database, use: "mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=mariadb-10.2.12" # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data/kimai.sqlite" -# Configure your db driver and server_version in config/packages/doctrine.yaml -# DATABASE_URL=mysql://db_user:db_pwd@127.0.0.1:3306/db_name +# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml +# DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name DATABASE_URL=sqlite:///%kernel.project_dir%/var/data/kimai.sqlite ###< doctrine/doctrine-bundle ### diff --git a/conf/app.src b/conf/app.src index 8252c98..ebe59ad 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/1.17.tar.gz -SOURCE_SUM=9b2fdab63268089eefdf32ba1fc9d33c496967abbe306e58ab134e0e401c4edd +SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/1.13.tar.gz +SOURCE_SUM=caab9910a85b16772af678ee8519a8030cd8496aa94ce0a0027fffa6a91f3fef SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index fe2326a..6919ef4 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ "de": "Eine web-basierte Mehrbenutzer-Zeiterfassung mit Rechnungsdruck mit Unterstützung für mobile Endgeräte", "cs": "Víceuživatelská webová aplikace pro sledování času s podporou mobilních zařízení" }, - "version": "1.17~ynh1", + "version": "1.13~ynh1", "url": "https://www.kimai.org", "upstream": { "license": "MIT",