kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-17 01:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge tag '5.0.4' into develop

Browse Source 
5.0.4

# Conflicts:
#	changelog.md
#	config/firefly.php
This commit is contained in:
James Cole
2020-02-01 16:17:24 +01:00
parent fb574cb173 3864855967
commit f99f166623
4 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
changelog.md
View File

@@ -17,6 +17,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- #3042 Rule engine behavior was inconsistent when importing data. - #3042 Rule engine behavior was inconsistent when importing data.
- #3064 Weird bug in reports. - #3064 Weird bug in reports.
## [5.0.4 (API 1.0.0)] - 2020-02-01
This release fixes several bugs found in 5.0.0 and earlier releases.
### Fixed
- If unset, `DB_CONNECTION` defaults to "mysql". This is now "pgsql", which is consistent with the documentation and the example configuration
file (`.env.example`).
## [5.0.3 (API 1.0.0)] - 2020-01-30 ## [5.0.3 (API 1.0.0)] - 2020-01-30
This release fixes several bugs found in 5.0.0 and earlier releases. This release fixes several bugs found in 5.0.0 and earlier releases.

2
config/database.php
View File

@@ -44,7 +44,7 @@ if (!(false === $databaseUrl)) {
return [ return [
'default' => envNonEmpty('DB_CONNECTION', 'mysql'), 'default' => envNonEmpty('DB_CONNECTION', 'pgsql'),
'connections' => [ 'connections' => [
'sqlite' => [ 'sqlite' => [
'driver' => 'sqlite', 'driver' => 'sqlite',

57
config/firefly.php
View File

@@ -128,43 +128,44 @@ use FireflyIII\User;
*/ */
return [ return [
'configuration' => [ 'configuration' => [
'single_user_mode' => true, 'single_user_mode' => true,
'is_demo_site' => false, 'is_demo_site' => false,
], ],
'feature_flags' => [ 'feature_flags' => [
'export' => true, 'export' => true,
], ],
'encryption' => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
'version' => '5.0.3', 'encryption' => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
'api_version' => '1.0.0', 'version' => '5.0.4',
'db_version' => 12, 'api_version' => '1.0.0',
'maxUploadSize' => 15242880, 'db_version' => 12,
'send_error_message' => env('SEND_ERROR_MESSAGE', true), 'maxUploadSize' => 15242880,
'site_owner' => env('SITE_OWNER', ''), 'send_error_message' => env('SEND_ERROR_MESSAGE', true),
'send_registration_mail' => env('SEND_REGISTRATION_MAIL', true), 'site_owner' => env('SITE_OWNER', ''),
'demo_username' => env('DEMO_USERNAME', ''), 'send_registration_mail' => env('SEND_REGISTRATION_MAIL', true),
'demo_password' => env('DEMO_PASSWORD', ''), 'demo_username' => env('DEMO_USERNAME', ''),
'is_sandstorm' => env('IS_SANDSTORM', 'unknown'), 'demo_password' => env('DEMO_PASSWORD', ''),
'bunq_use_sandbox' => env('BUNQ_USE_SANDBOX', false), 'is_sandstorm' => env('IS_SANDSTORM', 'unknown'),
'fixer_api_key' => env('FIXER_API_KEY', ''), 'bunq_use_sandbox' => env('BUNQ_USE_SANDBOX', false),
'mapbox_api_key' => env('MAPBOX_API_KEY', ''), 'fixer_api_key' => env('FIXER_API_KEY', ''),
'trusted_proxies' => env('TRUSTED_PROXIES', ''), 'mapbox_api_key' => env('MAPBOX_API_KEY', ''),
'search_result_limit' => env('SEARCH_RESULT_LIMIT', 50), 'trusted_proxies' => env('TRUSTED_PROXIES', ''),
'send_report_journals' => envNonEmpty('SEND_REPORT_JOURNALS', true), 'search_result_limit' => env('SEARCH_RESULT_LIMIT', 50),
'tracker_site_id' => env('TRACKER_SITE_ID', ''), 'send_report_journals' => envNonEmpty('SEND_REPORT_JOURNALS', true),
'tracker_url' => env('TRACKER_URL', ''), 'tracker_site_id' => env('TRACKER_SITE_ID', ''),
'disable_frame_header' => env('DISABLE_FRAME_HEADER', false), 'tracker_url' => env('TRACKER_URL', ''),
'disable_csp_header' => env('DISABLE_CSP_HEADER', false), 'disable_frame_header' => env('DISABLE_FRAME_HEADER', false),
'login_provider' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'), 'disable_csp_header' => env('DISABLE_CSP_HEADER', false),
'cer_provider' => envNonEmpty('CER_PROVIDER', 'fixer'), 'login_provider' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
'update_endpoint' => 'https://version.firefly-iii.org/index.json', 'cer_provider' => envNonEmpty('CER_PROVIDER', 'fixer'),
'default_location' => [ 'update_endpoint' => 'https://version.firefly-iii.org/index.json',
'default_location' => [
'longitude' => env('MAP_DEFAULT_LONG', '5.916667'), 'longitude' => env('MAP_DEFAULT_LONG', '5.916667'),
'latitude' => env('MAP_DEFAULT_LAT', '51.983333'), 'latitude' => env('MAP_DEFAULT_LAT', '51.983333'),
'zoom_level' => env('MAP_DEFAULT_ZOOM', '6'), 'zoom_level' => env('MAP_DEFAULT_ZOOM', '6'),
], ],
'allowedMimes' => [ 'allowedMimes' => [
/* plain files */ /* plain files */
'text/plain', 'text/plain',

2
config/queue.php
View File

@@ -100,7 +100,7 @@ return [
*/ */
'failed' => [ 'failed' => [
'database' => envNonEmpty('DB_CONNECTION', 'mysql'), 'database' => envNonEmpty('DB_CONNECTION', 'pgsql'),
'table' => 'failed_jobs', 'table' => 'failed_jobs',
], ],