diff --git a/.travis.yml b/.travis.yml index 040654a669..df725e203a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,10 @@ install: - mv storage/database/databasecopy.sqlite storage/database/database.sqlite script: - - phpunit \ No newline at end of file + - phpunit + +# safelist +branches: + only: + - develop + - master \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index e926fc7b54..81697a14cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. 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 ### Added - Beta support for Sandstorm.IO diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index d8dd3843f5..43d6df3be4 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -39,7 +39,7 @@ class AppServiceProvider extends ServiceProvider // force https urls if (env('APP_FORCE_SSL', false)) { - URL::forceSchema('https'); + URL::forceScheme('https'); } } diff --git a/config/firefly.php b/config/firefly.php index 7e28edf8dd..043b94c7c0 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -24,7 +24,7 @@ return [ ], 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), 'chart' => 'chartjs', - 'version' => '4.3.5', + 'version' => '4.3.6', 'csv_import_enabled' => true, 'maxUploadSize' => 5242880, 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'],