From 53eb93fc4def9620fdaea325e36ea99953ff0ba6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 27 Sep 2018 16:33:08 +0200 Subject: [PATCH] New meta files for the upcoming release. --- .sandstorm/changelog.md | 41 +++++++++++++++++++++ .sandstorm/launcher.sh | 6 ++-- .sandstorm/sandstorm-pkgdef.capnp | 4 +-- .sandstorm/service-config/nginx.conf | 2 +- .sandstorm/setup.sh | 26 +++++++------- changelog.md | 53 ++++++++++++++++++++++++++++ config/firefly.php | 6 ++-- readme.md | 1 + 8 files changed, 117 insertions(+), 22 deletions(-) diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md index 7840963539..8ec8b15d43 100644 --- a/.sandstorm/changelog.md +++ b/.sandstorm/changelog.md @@ -1,3 +1,44 @@ +# 4.7.7 +- [Issue 954](https://github.com/firefly-iii/firefly-iii/issues/954) Some additional view chart ranges +- [Issue 1710](https://github.com/firefly-iii/firefly-iii/issues/1710) Added a new currency ([hamuz](https://github.com/hamuz)) +- Transactions will now store (in the database) how they were created. +- [Issue 907](https://github.com/firefly-iii/firefly-iii/issues/907) Better and more options on the transaction list. +- [Issue 1450](https://github.com/firefly-iii/firefly-iii/issues/1450) Add a rule to change the type of a transaction automagically +- [Issue 1701](https://github.com/firefly-iii/firefly-iii/issues/1701) Fix reference to PHP executable ([hertzg](https://github.com/hertzg)) +- Budget limits have currency information, for future expansion. +- Some charts and pages can handle multiple currencies better. +- New GA code for those who use it. +- The credit card liability type has been removed. +- [Issue 896](https://github.com/firefly-iii/firefly-iii/issues/896) Better redirection when coming from deleted objects. +- [Issue 1519](https://github.com/firefly-iii/firefly-iii/issues/1519) Fix autocomplete tags +- [Issue 1607](https://github.com/firefly-iii/firefly-iii/issues/1607) Some fixes for the bunq api calls +- [Issue 1650](https://github.com/firefly-iii/firefly-iii/issues/1650) Add a negated amount column for CSV imports ([hamuz](https://github.com/hamuz)) +- [Issue 1658](https://github.com/firefly-iii/firefly-iii/issues/1658) Make font heavy again. +- [Issue 1660](https://github.com/firefly-iii/firefly-iii/issues/1660) Add a negated amount column for CSV imports ([hamuz](https://github.com/hamuz)) +- [Issue 1667](https://github.com/firefly-iii/firefly-iii/issues/1667) Fix pie charts +- [Issue 1668](https://github.com/firefly-iii/firefly-iii/issues/1668) YNAB iso_code fix +- [Issue 1670](https://github.com/firefly-iii/firefly-iii/issues/1670) Fix piggy bank API error +- [Issue 1671](https://github.com/firefly-iii/firefly-iii/issues/1671) More options for liability accounts. +- [Issue 1673](https://github.com/firefly-iii/firefly-iii/issues/1673) Fix reconciliation issues. +- [Issue 1675](https://github.com/firefly-iii/firefly-iii/issues/1675) Wrong sum in tag report. +- [Issue 1679](https://github.com/firefly-iii/firefly-iii/issues/1679) Change type of a transaction wouldn't trigger rules. +- [Issue 1682](https://github.com/firefly-iii/firefly-iii/issues/1682) Add liability accounts to transaction conversion +- [Issue 1683](https://github.com/firefly-iii/firefly-iii/issues/1683) See matching transaction showed transfers twice. +- [Issue 1685](https://github.com/firefly-iii/firefly-iii/issues/1685) fix autocomplete for rules +- [Issue 1690](https://github.com/firefly-iii/firefly-iii/issues/1690) Missing highlighted button in intro popup +- [Issue 1691](https://github.com/firefly-iii/firefly-iii/issues/1691) No mention of liabilities in demo text +- [Issue 1695](https://github.com/firefly-iii/firefly-iii/issues/1695) Small fixes in bills pages. +- [Issue 1708](https://github.com/firefly-iii/firefly-iii/issues/1708) Fix by [mathieupost](https://github.com/mathieupost) for bunq +- [Issue 1709](https://github.com/firefly-iii/firefly-iii/issues/1709) Fix oauth buttons +- [Issue 1712](https://github.com/firefly-iii/firefly-iii/issues/1712) Double slash fix by [hamuz](https://github.com/hamuz) +- [Issue 1719](https://github.com/firefly-iii/firefly-iii/issues/1719) Add missing accounts to API +- [Issue 1720](https://github.com/firefly-iii/firefly-iii/issues/1720) Fix validation for transaction type. +- [Issue 1723](https://github.com/firefly-iii/firefly-iii/issues/1723) API broken for currency exchange rates. +- [Issue 1728](https://github.com/firefly-iii/firefly-iii/issues/1728) Fix problem with transaction factory. +- [Issue 1729](https://github.com/firefly-iii/firefly-iii/issues/1729) Fix bulk transaction editor +- [Issue 1731](https://github.com/firefly-iii/firefly-iii/issues/1731) API failure for budget limits. +- Secure headers now allow Mapbox and the 2FA QR code. + # 4.7.6.2 - Docker file builds again. - Fix CSS of OAuth2 authorization view. diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh index cb7281917a..515a1413ab 100755 --- a/.sandstorm/launcher.sh +++ b/.sandstorm/launcher.sh @@ -37,15 +37,15 @@ HOME=/etc/mysql /usr/bin/mysql_install_db --force # Spawn mysqld, php HOME=/etc/mysql /usr/sbin/mysqld & -/usr/sbin/php-fpm7.1 --nodaemonize --fpm-config /etc/php/7.1/fpm/php-fpm.conf & +/usr/sbin/php-fpm7.2 --nodaemonize --fpm-config /etc/php/7.2/fpm/php-fpm.conf & # Wait until mysql and php have bound their sockets, indicating readiness while [ ! -e /var/run/mysqld/mysqld.sock ] ; do echo "waiting for mysql to be available at /var/run/mysqld/mysqld.sock" sleep .5 done -while [ ! -e /var/run/php7.1-fpm.sock ] ; do - echo "waiting for php7.1-fpm to be available at /var/run/php7.1-fpm.sock" +while [ ! -e /var/run/php7.2-fpm.sock ] ; do + echo "waiting for php7.2-fpm to be available at /var/run/php7.2-fpm.sock" sleep .5 done diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 7652b8f11c..afd4c76cc8 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Firefly III"), - appVersion = 16, - appMarketingVersion = (defaultText = "4.7.6.2"), + appVersion = 17, + appMarketingVersion = (defaultText = "4.7.7"), actions = [ # Define your "new document" handlers here. diff --git a/.sandstorm/service-config/nginx.conf b/.sandstorm/service-config/nginx.conf index 2d91cb5721..fded8af1a9 100644 --- a/.sandstorm/service-config/nginx.conf +++ b/.sandstorm/service-config/nginx.conf @@ -53,7 +53,7 @@ http { } location ~ \.php$ { try_files $uri =404; - fastcgi_pass unix:/var/run/php7.1-fpm.sock; + fastcgi_pass unix:/var/run/php7.2-fpm.sock; fastcgi_index index.php; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index 612d312770..c7121a47e6 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -37,38 +37,38 @@ wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list # install packages. -apt-get update -apt-get install -y nginx php7.1-fpm php7.1-mysql php7.1-gd php7.1-cli php7.1-curl git php7.1-dev php7.1-zip php7.1-intl php7.1-dom php7.1-mbstring php7.1-bcmath mysql-server +apt-get updater +apt-get install -y nginx php7.2-fpm php7.2-mysql php7.2-gd php7.2-cli php7.2-curl git php7.2-dev php7.2-zip php7.2-intl php7.2-dom php7.2-mbstring php7.2-bcmath mysql-server service nginx stop -service php7.1-fpm stop +service php7.2-fpm stop service mysql stop systemctl disable nginx -systemctl disable php7.1-fpm +systemctl disable php7.2-fpm systemctl disable mysql # make php.ini display errors: -sed -i 's/display_errors = Off/display_errors = On/g' /etc/php/7.1/fpm/php.ini +sed -i 's/display_errors = Off/display_errors = On/g' /etc/php/7.2/fpm/php.ini -# patch /etc/php/7.1/fpm/pool.d/www.conf to not change uid/gid to www-data +# patch /etc/php/7.2/fpm/pool.d/www.conf to not change uid/gid to www-data sed --in-place='' \ --expression='s/^listen.owner = www-data/;listen.owner = www-data/' \ --expression='s/^listen.group = www-data/;listen.group = www-data/' \ - /etc/php/7.1/fpm/pool.d/www.conf -# patch /etc/php/7.1/fpm/php-fpm.conf to not have a pidfile + /etc/php/7.2/fpm/pool.d/www.conf +# patch /etc/php/7.2/fpm/php-fpm.conf to not have a pidfile sed --in-place='' \ --expression='s/^pid =/;pid =/' \ - /etc/php/7.1/fpm/php-fpm.conf + /etc/php/7.2/fpm/php-fpm.conf # move sock file to better dir: sed --in-place='' \ - --expression='s/^listen = \/run\/php\/php7.1-fpm.sock/listen = \/var\/run\/php7.1-fpm.sock/' \ - /etc/php/7.1/fpm/pool.d/www.conf + --expression='s/^listen = \/run\/php\/php7.2-fpm.sock/listen = \/var\/run\/php7.2-fpm.sock/' \ + /etc/php/7.2/fpm/pool.d/www.conf -# patch /etc/php/7.1/fpm/pool.d/www.conf to no clear environment variables +# patch /etc/php/7.2/fpm/pool.d/www.conf to no clear environment variables # so we can pass in SANDSTORM=1 to apps sed --in-place='' \ --expression='s/^;clear_env = no/clear_env=no/' \ - /etc/php/7.1/fpm/pool.d/www.conf + /etc/php/7.2/fpm/pool.d/www.conf # patch mysql conf to not change uid, and to use /var/tmp over /tmp # for secure-file-priv see https://github.com/sandstorm-io/vagrant-spk/issues/195 sed --in-place='' \ diff --git a/changelog.md b/changelog.md index 8c5963a01a..2a32d471a9 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,59 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.7.7] - 2018-10-01 + +This version of Firefly III requires PHP 7.2. I've already started using several features from 7.2. Please make sure you upgrade. + +### Added +- [Issue 954](https://github.com/firefly-iii/firefly-iii/issues/954) Some additional view chart ranges +- [Issue 1710](https://github.com/firefly-iii/firefly-iii/issues/1710) Added a new currency ([hamuz](https://github.com/hamuz)) +- Transactions will now store (in the database) how they were created. + +### Changed +- [Issue 907](https://github.com/firefly-iii/firefly-iii/issues/907) Better and more options on the transaction list. +- [Issue 1450](https://github.com/firefly-iii/firefly-iii/issues/1450) Add a rule to change the type of a transaction automagically +- [Issue 1701](https://github.com/firefly-iii/firefly-iii/issues/1701) Fix reference to PHP executable ([hertzg](https://github.com/hertzg)) +- Budget limits have currency information, for future expansion. +- Some charts and pages can handle multiple currencies better. +- New GA code for those who use it. + +### Removed +- The credit card liability type has been removed. + +### Fixed +- [Issue 896](https://github.com/firefly-iii/firefly-iii/issues/896) Better redirection when coming from deleted objects. +- [Issue 1519](https://github.com/firefly-iii/firefly-iii/issues/1519) Fix autocomplete tags +- [Issue 1607](https://github.com/firefly-iii/firefly-iii/issues/1607) Some fixes for the bunq api calls +- [Issue 1650](https://github.com/firefly-iii/firefly-iii/issues/1650) Add a negated amount column for CSV imports ([hamuz](https://github.com/hamuz)) +- [Issue 1658](https://github.com/firefly-iii/firefly-iii/issues/1658) Make font heavy again. +- [Issue 1660](https://github.com/firefly-iii/firefly-iii/issues/1660) Add a negated amount column for CSV imports ([hamuz](https://github.com/hamuz)) +- [Issue 1667](https://github.com/firefly-iii/firefly-iii/issues/1667) Fix pie charts +- [Issue 1668](https://github.com/firefly-iii/firefly-iii/issues/1668) YNAB iso_code fix +- [Issue 1670](https://github.com/firefly-iii/firefly-iii/issues/1670) Fix piggy bank API error +- [Issue 1671](https://github.com/firefly-iii/firefly-iii/issues/1671) More options for liability accounts. +- [Issue 1673](https://github.com/firefly-iii/firefly-iii/issues/1673) Fix reconciliation issues. +- [Issue 1675](https://github.com/firefly-iii/firefly-iii/issues/1675) Wrong sum in tag report. +- [Issue 1679](https://github.com/firefly-iii/firefly-iii/issues/1679) Change type of a transaction wouldn't trigger rules. +- [Issue 1682](https://github.com/firefly-iii/firefly-iii/issues/1682) Add liability accounts to transaction conversion +- [Issue 1683](https://github.com/firefly-iii/firefly-iii/issues/1683) See matching transaction showed transfers twice. +- [Issue 1685](https://github.com/firefly-iii/firefly-iii/issues/1685) fix autocomplete for rules +- [Issue 1690](https://github.com/firefly-iii/firefly-iii/issues/1690) Missing highlighted button in intro popup +- [Issue 1691](https://github.com/firefly-iii/firefly-iii/issues/1691) No mention of liabilities in demo text +- [Issue 1695](https://github.com/firefly-iii/firefly-iii/issues/1695) Small fixes in bills pages. +- [Issue 1708](https://github.com/firefly-iii/firefly-iii/issues/1708) Fix by [mathieupost](https://github.com/mathieupost) for bunq +- [Issue 1709](https://github.com/firefly-iii/firefly-iii/issues/1709) Fix oauth buttons +- [Issue 1712](https://github.com/firefly-iii/firefly-iii/issues/1712) Double slash fix by [hamuz](https://github.com/hamuz) +- [Issue 1719](https://github.com/firefly-iii/firefly-iii/issues/1719) Add missing accounts to API +- [Issue 1720](https://github.com/firefly-iii/firefly-iii/issues/1720) Fix validation for transaction type. +- [Issue 1723](https://github.com/firefly-iii/firefly-iii/issues/1723) API broken for currency exchange rates. +- [Issue 1728](https://github.com/firefly-iii/firefly-iii/issues/1728) Fix problem with transaction factory. +- [Issue 1729](https://github.com/firefly-iii/firefly-iii/issues/1729) Fix bulk transaction editor +- [Issue 1731](https://github.com/firefly-iii/firefly-iii/issues/1731) API failure for budget limits. + +### Security +- Secure headers now allow Mapbox and the 2FA QR code. + ## [4.7.6.2] - 2018-09-03 ### Fixed - Docker file builds again. diff --git a/config/firefly.php b/config/firefly.php index 33d93a19ab..3168d62dfe 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -91,9 +91,9 @@ return [ 'is_demo_site' => false, ], 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, - 'version' => '4.7.6.2', - 'api_version' => '0.7', - 'db_version' => 4, + 'version' => '4.7.7', + 'api_version' => '0.8', + 'db_version' => 5, 'maxUploadSize' => 15242880, 'allowedMimes' => [ /* plain files */ diff --git a/readme.md b/readme.md index 7c71e52c4c..75d84d2a24 100644 --- a/readme.md +++ b/readme.md @@ -130,6 +130,7 @@ Several users have built pretty awesome stuff around the Firefly III API. Check * [An Android app by Mike Conway](https://play.google.com/store/apps/details?id=com.zerobyte.firefly) * [A Telegram bot by Igor Tsupko](https://github.com/may-cat/firefly-iii-telegram-bot) +* [An Android app by Daniel Quah](https://github.com/emansih/FireflyMobile) Want to be in this list? Let me know!