diff --git a/check_process b/check_process index 8de3a05..0ff4a7c 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_public=0 upgrade=1 # 4.5.18~ynh1 - upgrade=1 from_commit=572f98be58975399c5e7fc7d435a4ac5b78765da + #upgrade=1 from_commit=572f98be58975399c5e7fc7d435a4ac5b78765da backup_restore=1 multi_instance=1 port_already_use=0 diff --git a/conf/app.src b/conf/app.src index 4e6a23c..9d7000a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://download.invoiceninja.com/ninja-v4.5.45.zip -SOURCE_SUM=750d8a841621b327e0d66ec22fbd6fa44c018e7b0986222aec197d57374e5b82 +SOURCE_URL=https://download.invoiceninja.com/ninja-v4.5.47.zip +SOURCE_SUM=851e7a546ba1ccb8699dd818c14ce4a3192b521c82aef90e695681818649da71 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=invoiceninja-v4.5.45.zip +SOURCE_FILENAME=invoiceninja-v4.5.47.zip diff --git a/conf/nginx.conf b/conf/nginx.conf index a0c8abf..62bca5a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,11 +9,6 @@ location ^~ __PATH__/ { rewrite ^ __PATH__/index.php; } - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - # Add headers to serve security related headers more_set_headers "Strict-Transport-Security: max-age=15768000; includeSubDomains; preload;"; more_set_headers "X-Content-Type-Options: nosniff"; diff --git a/manifest.json b/manifest.json index eb53c55..05de4e0 100644 --- a/manifest.json +++ b/manifest.json @@ -3,9 +3,10 @@ "id": "invoiceninja", "packaging_format": 1, "description": { - "en": "Create and email invoices, track payments and expenses, and time tasks" + "en": "Create and email invoices, track payments and expenses", + "fr": "Créez et envoyez des factures par e-mail, suivez les paiements" }, - "version": "4.5.45~ynh1", + "version": "4.5.47~ynh1", "url": "https://invoiceninja.org", "upstream": { "license": "AAL", @@ -21,7 +22,7 @@ "url": "https://github.com/YunoHost-Apps/invoiceninja_ynh/" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index db7391f..6c5ab1f 100755 --- a/scripts/install +++ b/scripts/install @@ -84,7 +84,6 @@ db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name - #================================================= # INSTALL DEPENDENCIES #================================================= @@ -92,7 +91,6 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #=================================================