kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 06:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Version update.

Browse Source
This commit is contained in:
James Cole
2019-11-13 06:57:17 +01:00
parent 88f1adf650
commit 8a9e12c2b9
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.env.example
View File

@@ -26,12 +26,13 @@ APP_URL=http://localhost
TRUSTED_PROXIES= TRUSTED_PROXIES=
# The log channel defines where your log entries go to. # 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' # - For everything else, use 'daily'
# Several other options exist. You can use 'single' for one big fat error log (not recommended). # 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. # 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: # Log level. You can set this from least severe to most severe:
# debug, info, notice, warning, error, critical, alert, emergency # debug, info, notice, warning, error, critical, alert, emergency

8
.travis.yml
View File

@@ -14,21 +14,21 @@ jobs:
include: include:
- dist: xenial - dist: xenial
arch: amd64 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 stage: build
script: ./.deploy/docker/travis.sh script: ./.deploy/docker/travis.sh
- dist: xenial - dist: xenial
arch: amd64 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 stage: build
script: ./.deploy/docker/travis.sh script: ./.deploy/docker/travis.sh
- dist: xenial - dist: xenial
arch: arm64 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 stage: build
script: ./.deploy/docker/travis.sh script: ./.deploy/docker/travis.sh
- dist: xenial - dist: xenial
arch: amd64 arch: amd64
env: CHANNEL=alpha VERSION=4.8.2-alpha.2 env: CHANNEL=alpha VERSION=4.8.2-alpha.3
stage: manifest stage: manifest
script: ./.deploy/docker/manifest.sh script: ./.deploy/docker/manifest.sh

2
app/Http/Controllers/System/InstallController.php
View File

@@ -104,7 +104,7 @@ class InstallController extends Controller
'firefly-iii:fix-long-descriptions' => [], 'firefly-iii:fix-long-descriptions' => [],
// final command to set latest version in DB // 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],
]; ];
} }

2
app/Support/Http/Controllers/UserNavigation.php
View File

@@ -72,7 +72,7 @@ trait UserNavigation
return false; return false;
} }
$type = $journal->transactionType->type; $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); return in_array($type, $editable, true);
} }

2
config/firefly.php
View File

@@ -125,7 +125,7 @@ return [
'is_demo_site' => false, 'is_demo_site' => false,
], ],
'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, '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', 'api_version' => '0.10.5',
'db_version' => 11, 'db_version' => 11,
'maxUploadSize' => 15242880, 'maxUploadSize' => 15242880,