IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/4.3.6'

Browse Source
This commit is contained in:
James Cole 2017-02-20 05:43:34 +01:00
commit 56199f899f
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -21,3 +21,9 @@ install:
script: script:
- phpunit - phpunit
# safelist
branches:
only:
- develop
- master

5
CHANGELOG.md
View File

@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## [4.3.6] - 2017-02-20
### Fixed
- #578, reported by [xpfgsyb](https://github.com/xpfgsyb).
## [4.3.5] - 2017-02-19 ## [4.3.5] - 2017-02-19
### Added ### Added
- Beta support for Sandstorm.IO - Beta support for Sandstorm.IO

2
app/Providers/AppServiceProvider.php
View File

@ -39,7 +39,7 @@ class AppServiceProvider extends ServiceProvider
// force https urls // force https urls
if (env('APP_FORCE_SSL', false)) { if (env('APP_FORCE_SSL', false)) {
URL::forceSchema('https'); URL::forceScheme('https');
} }
} }

2
config/firefly.php
View File

@ -24,7 +24,7 @@ return [
], ],
'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
'chart' => 'chartjs', 'chart' => 'chartjs',
'version' => '4.3.5', 'version' => '4.3.6',
'csv_import_enabled' => true, 'csv_import_enabled' => true,
'maxUploadSize' => 5242880, 'maxUploadSize' => 5242880,
'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'],