diff --git a/README.md b/README.md index 4989793..89968d8 100644 --- a/README.md +++ b/README.md @@ -15,16 +15,20 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Self-hosted financial manager +"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. -**Shipped version:** 5.6.8~ynh1 +Firefly III should give you insight into and control over your finances. Money should be useful, not scary. You should be able to see where it is going, to feel your expenses and to... wow, I'm going overboard with this aren't I? + +But you get the idea: this is your money. These are your expenses. Stop them from controlling you. I built this tool because I started to dislike money. Having money, not having money, paying bills with money, you get the idea. But no more. I want to feel "safe", whatever my balance is. And I hope this tool can help you. I know it helps me. + + +**Shipped version:** 5.7.2~ynh1 **Demo:** https://demo.firefly-iii.org/login ## Screenshots -![](./doc/screenshots/budget.png) -![](./doc/screenshots/ff2.png) +![](./doc/screenshots/imac-complete.png) ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index d674c9a..efb8bf3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,16 +11,20 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Gestionnaire de finances personnelles +"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. -**Version incluse :** 5.6.8~ynh1 +Firefly III should give you insight into and control over your finances. Money should be useful, not scary. You should be able to see where it is going, to feel your expenses and to... wow, I'm going overboard with this aren't I? + +But you get the idea: this is your money. These are your expenses. Stop them from controlling you. I built this tool because I started to dislike money. Having money, not having money, paying bills with money, you get the idea. But no more. I want to feel "safe", whatever my balance is. And I hope this tool can help you. I know it helps me. + + +**Version incluse :** 5.7.2~ynh1 **Démo :** https://demo.firefly-iii.org/login ## Captures d'écran -![](./doc/screenshots/budget.png) -![](./doc/screenshots/ff2.png) +![](./doc/screenshots/imac-complete.png) ## Documentations et ressources diff --git a/check_process b/check_process index fec9a17..c5592dc 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=5ee628f58c4f9ea6b6fd48d843453c47ed3d34e4 + upgrade=1 from_commit=0245c6c17328e504114058930dea9dda28a18fdf backup_restore=1 multi_instance=1 change_url=0 diff --git a/conf/app.src b/conf/app.src index 24b6d2a..64a5ab2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/firefly-iii/firefly-iii/archive/refs/tags/5.6.8.tar.gz -SOURCE_SUM=a1f7e30b7fa0ded2c10271e2f9f4b61fb26e3b0d4183250e444bfea92a016609 +SOURCE_URL=https://github.com/firefly-iii/firefly-iii/archive/refs/tags/5.7.2.tar.gz +SOURCE_SUM=8F11D15BB1973C74FA76A7C33290DA7300D44279E265617DB487B2676A57E16F SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 98b151f..94e986a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,7 +11,7 @@ location __PATH__/ { } # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - #client_max_body_size 50M; + client_max_body_size 5M; try_files $uri $uri/ index.php; location ~ '[^/]\.php$|^/update.php' { diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..6e1cfda --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,5 @@ +"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. + +Firefly III should give you insight into and control over your finances. Money should be useful, not scary. You should be able to see where it is going, to feel your expenses and to... wow, I'm going overboard with this aren't I? + +But you get the idea: this is your money. These are your expenses. Stop them from controlling you. I built this tool because I started to dislike money. Having money, not having money, paying bills with money, you get the idea. But no more. I want to feel "safe", whatever my balance is. And I hope this tool can help you. I know it helps me. diff --git a/doc/screenshots/budget.png b/doc/screenshots/budget.png deleted file mode 100644 index 2e93ee2..0000000 Binary files a/doc/screenshots/budget.png and /dev/null differ diff --git a/doc/screenshots/ff2.png b/doc/screenshots/ff2.png deleted file mode 100644 index 1d9a1be..0000000 Binary files a/doc/screenshots/ff2.png and /dev/null differ diff --git a/doc/screenshots/imac-complete.png b/doc/screenshots/imac-complete.png new file mode 100644 index 0000000..82d9d7d Binary files /dev/null and b/doc/screenshots/imac-complete.png differ diff --git a/manifest.json b/manifest.json index cc4e945..c405d39 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted financial manager", "fr": "Gestionnaire de finances personnelles" }, - "version": "5.6.8~ynh1", + "version": "5.7.2~ynh1", "url": "https://firefly-iii.org/", "upstream": { "license": "GPL-3.0-or-later", @@ -49,6 +49,10 @@ { "name": "is_public", "type": "boolean", + "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.", + "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." + }, "default": true } ] diff --git a/scripts/_common.sh b/scripts/_common.sh index 0dff24f..5336697 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,12 +7,12 @@ # dependencies used by the app latest_tag=$(curl -s https://api.github.com/repos/firefly-iii/firefly-iii/releases/latest | grep 'tag_name' | cut -d\" -f4) -tag="5.5.11" +tag="5.7.2" YNH_PHP_VERSION="8.0" # Composer version -YNH_COMPOSER_VERSION="2.0.13" +YNH_COMPOSER_VERSION="2.3.3" pkg_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-opcache php${YNH_PHP_VERSION}-ldap"