kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/4.8.2-beta.1'

Browse Source
This commit is contained in:
James Cole
2019-11-17 07:02:36 +01:00
parent 075c06fb86 55e2f31531
commit 6b2b2aa1e1
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.deploy/docker/entrypoint.sh
View File

@@ -93,6 +93,7 @@ php artisan firefly-iii:fix-long-descriptions
php artisan firefly-iii:report-empty-objects php artisan firefly-iii:report-empty-objects
php artisan firefly-iii:report-sum php artisan firefly-iii:report-sum
php artisan firefly-iii:restore-oauth-keys php artisan firefly-iii:restore-oauth-keys
php artisan firefly-iii:set-latest-version --james-is-cool
php artisan passport:install php artisan passport:install
php artisan cache:clear php artisan cache:clear

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.4 env: ARCH=amd64 CHANNEL=beta VERSION=4.8.2-beta.1
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.4 env: ARCH=arm CHANNEL=beta VERSION=4.8.2-beta.1
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.4 env: ARCH=arm64 CHANNEL=beta VERSION=4.8.2-beta.1
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.4 env: CHANNEL=beta VERSION=4.8.2-beta.1
stage: manifest stage: manifest
script: ./.deploy/docker/manifest.sh script: ./.deploy/docker/manifest.sh

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.4', 'version' => '4.8.2-beta.1',
'api_version' => '0.10.5', 'api_version' => '0.10.5',
'db_version' => 11, 'db_version' => 11,
'maxUploadSize' => 15242880, 'maxUploadSize' => 15242880,