diff --git a/.env.example b/.env.example index 058576b90b..7c381ad27e 100644 --- a/.env.example +++ b/.env.example @@ -26,12 +26,13 @@ APP_URL=http://localhost TRUSTED_PROXIES= # The log channel defines where your log entries go to. -# - If you use DOCKER, use 'docker_out' +# - Docker + versions <= 4.8.1.8 and before: use "stdout" +# - Docker + versions > 4.8.1.8: use "docker_out" # - For everything else, use 'daily' # Several other options exist. You can use 'single' for one big fat error log (not recommended). # Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself. -LOG_CHANNEL=docker_out +LOG_CHANNEL=stdout # Log level. You can set this from least severe to most severe: # debug, info, notice, warning, error, critical, alert, emergency diff --git a/.travis.yml b/.travis.yml index 6c8f32702d..655b6f0faf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,21 +14,21 @@ jobs: include: - dist: xenial arch: amd64 - env: ARCH=amd64 CHANNEL=alpha VERSION=4.8.2-alpha.2 + env: ARCH=amd64 CHANNEL=alpha VERSION=4.8.2-alpha.3 stage: build script: ./.deploy/docker/travis.sh - dist: xenial arch: amd64 - env: ARCH=arm CHANNEL=alpha VERSION=4.8.2-alpha.2 + env: ARCH=arm CHANNEL=alpha VERSION=4.8.2-alpha.3 stage: build script: ./.deploy/docker/travis.sh - dist: xenial arch: arm64 - env: ARCH=arm64 CHANNEL=alpha VERSION=4.8.2-alpha.2 + env: ARCH=arm64 CHANNEL=alpha VERSION=4.8.2-alpha.3 stage: build script: ./.deploy/docker/travis.sh - dist: xenial arch: amd64 - env: CHANNEL=alpha VERSION=4.8.2-alpha.2 + env: CHANNEL=alpha VERSION=4.8.2-alpha.3 stage: manifest script: ./.deploy/docker/manifest.sh \ No newline at end of file diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index 43baf5babd..0fde6ac8ec 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -104,7 +104,7 @@ class InstallController extends Controller 'firefly-iii:fix-long-descriptions' => [], // final command to set latest version in DB - 'firefly-iii:set-last-version' => ['--james-is-cool' => true], + 'firefly-iii:set-latest-version' => ['--james-is-cool' => true], ]; } diff --git a/app/Support/Http/Controllers/UserNavigation.php b/app/Support/Http/Controllers/UserNavigation.php index 6d49b4bb7f..5a297474c5 100644 --- a/app/Support/Http/Controllers/UserNavigation.php +++ b/app/Support/Http/Controllers/UserNavigation.php @@ -72,7 +72,7 @@ trait UserNavigation return false; } $type = $journal->transactionType->type; - $editable = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::DEPOSIT]; + $editable = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::DEPOSIT, TransactionType::RECONCILIATION]; return in_array($type, $editable, true); } diff --git a/config/firefly.php b/config/firefly.php index 6716c1b117..83ce83f303 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -125,7 +125,7 @@ return [ 'is_demo_site' => false, ], 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, - 'version' => '4.8.2-alpha.2', + 'version' => '4.8.2-alpha.3', 'api_version' => '0.10.5', 'db_version' => 11, 'maxUploadSize' => 15242880,