Merge branch 'release/4.7.13'

.deploy/docker/entrypoint.sh

@@ -44,7 +44,7 @@ echo "Remove log file..."
 rm -f $FIREFLY_PATH/storage/logs/laravel.log
 
 echo "Map environment variables on .env file..."
-cat .env.docker | envsubst > .env
+cat $FIREFLY_PATH/.deploy/docker/.env.docker | envsubst > $FIREFLY_PATH/.env
 echo "Dump auto load..."
 composer dump-autoload
 echo "Discover packages..."

.locales → .deploy/heroku/.locales

@@ -1,9 +1,11 @@
 en_US
+es_ES
 de_DE
 fr_FR
 it_IT
 nl_NL
 pl_PL
 pt_BR
 ru_RU
-tr_TR
+zh_TW
+zh_CN

.sandstorm/build.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 echo "In build.sh"
 
 cd /opt/app
-cp .env.sandstorm .env
+cp .deploy/sandstorm/.env.sandstorm .env
 
 if [ -f /opt/app/composer.json ] ; then
     if [ ! -f composer.phar ] ; then

.sandstorm/changelog.md

@@ -1,3 +1,11 @@
+# 4.7.13 (API 0.9.2)
+- 4.7.13 was released to fix an issue that affected the Softaculous build.
+- A routine has been added that warns about transactions with a 0.00 amount.
+- PHP maximum execution time is now 600 seconds in the Docker image.
+- Moved several files outside of the root of Firefly III
+- Fix issue where missing preference breaks the database upgrade.
+- [Issue 2100](https://github.com/firefly-iii/firefly-iii/issues/2100) Mass edit transactions results in a reset of the date.
+
 # 4.7.12
 - 4.7.12 was released to fix several shortcomings in v4.7.11's Docker image. Those in turn were caused by me. My apologies.
 - [Issue 2085](https://github.com/firefly-iii/firefly-iii/issues/2085) Upgraded the LDAP code. To keep using LDAP, set the `LOGIN_PROVIDER` to `ldap`.

.sandstorm/sandstorm-pkgdef.capnp

@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 22,
-    appMarketingVersion = (defaultText = "4.7.12"),
+    appVersion = 23,
+    appMarketingVersion = (defaultText = "4.7.13"),
 
     actions = [
       # Define your "new document" handlers here.

.sandstorm/setup.sh

@@ -13,6 +13,7 @@ apt-get update
 apt-get install -y python-software-properties software-properties-common
 
 # install all languages
+#en_US
 sed -i 's/# es_ES.UTF-8 UTF-8/es_ES.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen
@@ -22,6 +23,7 @@ sed -i 's/# pl_PL.UTF-8 UTF-8/pl_PL.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# pt_BR.UTF-8 UTF-8/pt_BR.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# zh_TW.UTF-8 UTF-8/zh_TW.UTF-8 UTF-8/g' /etc/locale.gen
+sed -i 's/# zh_CN.UTF-8 UTF-8/zh_CN.UTF-8 UTF-8/g' /etc/locale.gen
 
 dpkg-reconfigure --frontend=noninteractive locales
 

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: bash
 env:
-  - VERSION=4.7.12
+  - VERSION=4.7.13
 
 dist: xenial
 

Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.2-apache
 
 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
-LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"
+LABEL version="1.4" maintainer="thegrumpydictator@gmail.com"
 
 # Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
@@ -44,6 +44,11 @@ RUN chown -R www-data:www-data /var/www && \
     locale-gen && \
     composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
+# configure PHP
+RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
+    sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \
+    sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini
+
 # Expose port 80
 EXPOSE 80
 

Dockerfile.amd64

@@ -1,7 +1,7 @@
 FROM php:7.2-apache
 ARG ARCH
 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
-LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"
+LABEL version="1.4" maintainer="thegrumpydictator@gmail.com"
 
 # Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
@@ -44,6 +44,12 @@ RUN chown -R www-data:www-data /var/www && \
     locale-gen && \
     composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
+# configure PHP
+RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
+    sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \
+    sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini
+
+
 # Expose port 80
 EXPOSE 80
 

Dockerfile.arm

@@ -2,7 +2,7 @@ FROM arm32v7/php:7.2.8-apache-stretch
 ARG ARCH
 COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static
 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
-LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"
+LABEL version="1.4" maintainer="thegrumpydictator@gmail.com"
 
 # Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
@@ -43,6 +43,12 @@ RUN chown -R www-data:www-data /var/www && \
     locale-gen && \
     composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
+# configure PHP
+RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
+    sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \
+    sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini
+
+
 # Expose port 80
 EXPOSE 80
 

Dockerfile.arm64

@@ -2,7 +2,7 @@ FROM arm32v7/php:7.2.8-apache-stretch
 ARG ARCH
 COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static
 ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
-LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"
+LABEL version="1.4" maintainer="thegrumpydictator@gmail.com"
 
 # Create volumes
 VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
@@ -43,6 +43,12 @@ RUN chown -R www-data:www-data /var/www && \
     locale-gen && \
     composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
+# configure PHP
+RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
+    sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \
+    sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini
+
+
 # Expose port 80
 EXPOSE 80