Merge pull request #125 from NiklasMM/master

Upgrade to current latest version 6.1.15 and fix some minor issues with documentation

README.md

@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**Shipped version:** 6.1.11~ynh1
+**Shipped version:** 6.1.15~ynh1
 
 **Demo:** <https://demo.firefly-iii.org/login>
 

README_eu.md

@@ -19,7 +19,7 @@ EZ editatu eskuz.
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**Paketatutako bertsioa:** 6.1.11~ynh1
+**Paketatutako bertsioa:** 6.1.15~ynh1
 
 **Demoa:** <https://demo.firefly-iii.org/login>
 

README_fr.md

@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Firefly III est un gestionnaire pour vos finances personnelles. Cela peut vous aider à suivre vos dépenses et vos revenus, afin que vous puissiez dépenser moins et économiser plus. Firefly III prend en charge l'utilisation de budgets, de catégories et de balises. À l'aide d'outils externes: [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), vous pouvez importer des données. Il a également de nombreux rapports financiers soignés disponibles.
 
-**Version incluse :** 6.1.11~ynh1
+**Version incluse :** 6.1.15~ynh1
 
 **Démo :** <https://demo.firefly-iii.org/login>
 

README_gl.md

@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**Versión proporcionada:** 6.1.11~ynh1
+**Versión proporcionada:** 6.1.15~ynh1
 
 **Demo:** <https://demo.firefly-iii.org/login>
 

README_it.md

@@ -19,7 +19,7 @@ NON DEVE essere modificato manualmente.
 "Firefly III" is a (self-hosted) manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using a bunch of external tools, you can import data. It also has many neat financial reports available.
 
 
-**Versione pubblicata:** 6.0.5~ynh1
+**Versione pubblicata:** 6.1.15~ynh1
 
 **Prova:** <https://demo.firefly-iii.org/login>
 

README_zh_Hans.md

@@ -19,7 +19,7 @@
 Firefly III is a manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. Using external tools, ie [Firefly III Importer](https://github.com/YunoHost-Apps/firefly-iii-di_ynh), you can import data. It also has many neat financial reports available.
 
 
-**分发版本：** 6.1.11~ynh1
+**分发版本：** 6.1.15~ynh1
 
 **演示：** <https://demo.firefly-iii.org/login>
 

manifest.toml

@@ -5,12 +5,12 @@ name = "Firefly III"
 description.en = "Self-hosted financial manager"
 description.fr = "Gestionnaire de finances personnelles"
 
-version = "6.1.11~ynh1"
+version = "6.1.15~ynh1"
 
 maintainers = []
 
 [upstream]
-license = "GPL-3.0-or-later"
+license = "AGPL-3.0-or-later"
 website = "https://firefly-iii.org/"
 demo = "https://demo.firefly-iii.org/login"
 admindoc = "https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/introduction/"
@@ -38,7 +38,7 @@ ram.runtime = "50M"
     default = "/firefly"
 
     [install.init_main_permission]
-    help.en = "If enabled, firefly-iii will be accessible by people who doesn’t have an account. This can be changed later via the webadmin."
+    help.en = "If enabled, firefly-iii will be accessible by people who don't have an account. This can be changed later via the webadmin."
     help.fr = "Si cette case est cochée, firefly-iii sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
     type = "group"
     default = "visitors"
@@ -55,8 +55,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/firefly-iii/firefly-iii/releases/download/v6.1.11/FireflyIII-v6.1.11.zip"
+        url = "https://github.com/firefly-iii/firefly-iii/releases/download/v6.1.15/FireflyIII-v6.1.15.zip"
-        sha256 = "f6e3df061c9351daf8b70935e30b5ae6d8650efae27d1cc988e1c2a917d8de87"
+        sha256 = "5af13d7508254f5cf96d0f09db1e3dcffe9252c2f8e9b9678298e4b6fb155d04"
         in_subdir = false
         autoupdate.strategy = "latest_github_release"
         autoupdate.asset = ".*.zip"

scripts/upgrade

@@ -58,12 +58,13 @@ pushd "$install_dir"
     php$phpversion artisan firefly-iii:upgrade-database
     php$phpversion artisan passport:keys || true
     php$phpversion artisan cache:clear
+    php$phpversion artisan view:clear
 popd
 
 #=================================================
 # SETUP A CRON
 #=================================================
-ynh_script_progression --message="Setuping a cron..."
+ynh_script_progression --message="Setting up a cron job ..."
 
 ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
 chown root: "/etc/cron.d/$app"