Update meta files for new release.

2025-01-24 15:26:33 -06:00 · 2019-03-02 15:55:01 +01:00 · 2019-03-02 15:55:01 +01:00 · e85ac07c49
commit e85ac07c49
parent b7f0a6fff4
6 changed files with 85 additions and 137 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -1,8 +1,10 @@
 <!--
-Please read me:
+Before you create a new PR, please consider the following two considerations.

-1) DO NOT create a pull request for the MASTER branch.
-2) DO NOT create pull requests to add new CURRENCIES.
+1) Pull request for the MASTER branch will be closed.
+2) We cannot accept pull requests to add new currencies.
+
+Thanks.
 -->

 Fixes issue # (if relevant)
--- a/.sandstorm/changelog.md
+++ b/.sandstorm/changelog.md
@ -1,3 +1,12 @@
+# 4.7.15 (API 0.9.2)
+- 4.7.15 was released to fix some issues upgrading from older versions.
+- [Issue 2128](https://github.com/firefly-iii/firefly-iii/issues/2128) Support for Postgres SSL
+- [Issue 2120](https://github.com/firefly-iii/firefly-iii/issues/2120) Add a missing meta tag, thanks to @lastlink
+- Search is a lot faster now.
+- [Issue 2125](https://github.com/firefly-iii/firefly-iii/issues/2125) Decryption issues during upgrade
+- [Issue 2130](https://github.com/firefly-iii/firefly-iii/issues/2130) Fixed database migrations and rollbacks.
+- [Issue 2135](https://github.com/firefly-iii/firefly-iii/issues/2135) Date fixes in transaction overview
+
 # 4.7.14 (API 0.9.2)
 - 4.7.14 was released to fix an issue with the Composer installation script.

--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (

  manifest = (
    appTitle = (defaultText = "Firefly III"),
-    appVersion = 24,
-    appMarketingVersion = (defaultText = "4.7.14"),
+    appVersion = 25,
+    appMarketingVersion = (defaultText = "4.7.15"),

    actions = [
      # Define your "new document" handlers here.
--- a/changelog.md
+++ b/changelog.md
@ -2,6 +2,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## [4.7.15 (API 0.9.2)] - 2019-03-02
+
+4.7.15 was released to fix some issues upgrading from older versions.
+
+### Added
+- [Issue 2128](https://github.com/firefly-iii/firefly-iii/issues/2128) Support for Postgres SSL
+
+### Changed
+- [Issue 2120](https://github.com/firefly-iii/firefly-iii/issues/2120) Add a missing meta tag, thanks to @lastlink
+- Search is a lot faster now.
+
+### Fixed
+- [Issue 2125](https://github.com/firefly-iii/firefly-iii/issues/2125) Decryption issues during upgrade
+- [Issue 2130](https://github.com/firefly-iii/firefly-iii/issues/2130) Fixed database migrations and rollbacks.
+- [Issue 2135](https://github.com/firefly-iii/firefly-iii/issues/2135) Date fixes in transaction overview
+
 ## [4.7.14 (API 0.9.2)] - 2019-02-24

 4.7.14 was released to fix an issue with the Composer installation script.
--- a/composer.lock
+++ b/composer.lock
@ -8,28 +8,32 @@
    "packages": [
        {
            "name": "adldap2/adldap2",
-            "version": "v9.1.4",
+            "version": "v10.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/Adldap2/Adldap2.git",
-                "reference": "e74bf7e3762b35e828179b11eb100da4a12ff701"
+                "reference": "9e4a41dfd045b6b45b03576e409a99f69dd5dd8e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Adldap2/Adldap2/zipball/e74bf7e3762b35e828179b11eb100da4a12ff701",
-                "reference": "e74bf7e3762b35e828179b11eb100da4a12ff701",
+                "url": "https://api.github.com/repos/Adldap2/Adldap2/zipball/9e4a41dfd045b6b45b03576e409a99f69dd5dd8e",
+                "reference": "9e4a41dfd045b6b45b03576e409a99f69dd5dd8e",
                "shasum": ""
            },
            "require": {
                "ext-ldap": "*",
                "illuminate/contracts": "~5.0",
                "php": ">=7.0",
+                "psr/log": "~1.1",
                "tightenco/collect": "~5.0"
            },
            "require-dev": {
                "mockery/mockery": "~1.0",
                "phpunit/phpunit": "~6.0"
            },
+            "suggest": {
+                "ext-fileinfo": "fileinfo is required when retrieving user encoded thumbnails"
+            },
            "type": "library",
            "autoload": {
                "psr-4": {
@ -57,24 +61,24 @@
                "ldap",
                "windows"
            ],
-            "time": "2018-12-06T15:03:32+00:00"
+            "time": "2019-02-20T15:52:32+00:00"
        },
        {
            "name": "adldap2/adldap2-laravel",
-            "version": "v5.1.1",
+            "version": "v5.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/Adldap2/Adldap2-Laravel.git",
-                "reference": "293721cd55b9410e274985ec6f869ea0cc499275"
+                "reference": "b3f5c533f3bda00ba22e8e1b6c29e4b1bb7cc230"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Adldap2/Adldap2-Laravel/zipball/293721cd55b9410e274985ec6f869ea0cc499275",
-                "reference": "293721cd55b9410e274985ec6f869ea0cc499275",
+                "url": "https://api.github.com/repos/Adldap2/Adldap2-Laravel/zipball/b3f5c533f3bda00ba22e8e1b6c29e4b1bb7cc230",
+                "reference": "b3f5c533f3bda00ba22e8e1b6c29e4b1bb7cc230",
                "shasum": ""
            },
            "require": {
-                "adldap2/adldap2": "^9.0",
+                "adldap2/adldap2": "^10.0",
                "php": ">=7.1"
            },
            "require-dev": {
@ -110,7 +114,7 @@
                "laravel",
                "ldap"
            ],
-            "time": "2019-01-08T15:37:47+00:00"
+            "time": "2019-02-27T07:09:43+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@ -396,26 +400,26 @@
        },
        {
            "name": "davejamesmiller/laravel-breadcrumbs",
-            "version": "5.2.0",
+            "version": "5.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git",
-                "reference": "e2ed8b0992231ebc61480c63f095a2cf3b8829a1"
+                "reference": "6465e8710341578092fdd8aea24319d4f53ab27c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/e2ed8b0992231ebc61480c63f095a2cf3b8829a1",
-                "reference": "e2ed8b0992231ebc61480c63f095a2cf3b8829a1",
+                "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/6465e8710341578092fdd8aea24319d4f53ab27c",
+                "reference": "6465e8710341578092fdd8aea24319d4f53ab27c",
                "shasum": ""
            },
            "require": {
-                "illuminate/support": "5.6.*|5.7.*",
-                "illuminate/view": "5.6.*|5.7.*",
+                "illuminate/support": "5.6.*|5.7.*|5.8.*",
+                "illuminate/view": "5.6.*|5.7.*|5.8.*",
                "php": ">=7.1.3"
            },
            "require-dev": {
-                "laravel/framework": "5.6.*|5.7.*",
-                "orchestra/testbench": "3.6.*|3.7.*",
+                "laravel/framework": "5.6.*|5.7.*|5.8.*",
+                "orchestra/testbench": "3.6.*|3.7.*|3.8.*",
                "php-coveralls/php-coveralls": "^1.0",
                "phpunit/phpunit": "7.*"
            },
@ -450,7 +454,7 @@
            "keywords": [
                "laravel"
            ],
-            "time": "2018-10-30T22:06:33+00:00"
+            "time": "2019-02-27T13:09:37+00:00"
        },
        {
            "name": "defuse/php-encryption",
@ -1304,16 +1308,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v5.7.27",
+            "version": "v5.7.28",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "688fbfa889d43f392825b381ad3981847120fdfa"
+                "reference": "8e69728f1c80a024588adbd24c65c4fcf9aa9192"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/688fbfa889d43f392825b381ad3981847120fdfa",
-                "reference": "688fbfa889d43f392825b381ad3981847120fdfa",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/8e69728f1c80a024588adbd24c65c4fcf9aa9192",
+                "reference": "8e69728f1c80a024588adbd24c65c4fcf9aa9192",
                "shasum": ""
            },
            "require": {
@ -1386,7 +1390,7 @@
                "mockery/mockery": "^1.0",
                "moontoast/math": "^1.1",
                "orchestra/testbench-core": "3.7.*",
-                "pda/pheanstalk": "^3.0",
+                "pda/pheanstalk": "^3.0|^4.0",
                "phpunit/phpunit": "^7.5",
                "predis/predis": "^1.1.1",
                "symfony/css-selector": "^4.1",
@ -1408,7 +1412,7 @@
                "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
                "moontoast/math": "Required to use ordered UUIDs (^1.1).",
                "nexmo/client": "Required to use the Nexmo transport (^1.0).",
-                "pda/pheanstalk": "Required to use the beanstalk queue driver (^3.0).",
+                "pda/pheanstalk": "Required to use the beanstalk queue driver (^3.0|^4.0).",
                "predis/predis": "Required to use the redis cache and queue drivers (^1.0).",
                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).",
                "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.1).",
@ -1446,7 +1450,7 @@
                "framework",
                "laravel"
            ],
-            "time": "2019-02-19T14:37:47+00:00"
+            "time": "2019-02-26T15:41:34+00:00"
        },
        {
            "name": "laravel/nexmo-notification-channel",
@ -4645,16 +4649,16 @@
        },
        {
            "name": "tightenco/collect",
-            "version": "v5.7.26",
+            "version": "v5.8.2",
            "source": {
                "type": "git",
                "url": "https://github.com/tightenco/collect.git",
-                "reference": "c1a36a2a8a0aa731c1acdcd83f57724ffe630d00"
+                "reference": "9e431d3ba84ff02183bbb6da07410d59ef769f9b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/tightenco/collect/zipball/c1a36a2a8a0aa731c1acdcd83f57724ffe630d00",
-                "reference": "c1a36a2a8a0aa731c1acdcd83f57724ffe630d00",
+                "url": "https://api.github.com/repos/tightenco/collect/zipball/9e431d3ba84ff02183bbb6da07410d59ef769f9b",
+                "reference": "9e431d3ba84ff02183bbb6da07410d59ef769f9b",
                "shasum": ""
            },
            "require": {
@ -4691,7 +4695,7 @@
                "collection",
                "laravel"
            ],
-            "time": "2019-02-13T19:40:13+00:00"
+            "time": "2019-02-26T18:45:33+00:00"
        },
        {
            "name": "tijsverkoyen/css-to-inline-styles",
@ -4925,30 +4929,30 @@
    "packages-dev": [
        {
            "name": "barryvdh/laravel-ide-helper",
-            "version": "v2.5.3",
+            "version": "v2.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "3d7f1240896a075aa23b13f82dfcbe165dadeef2"
+                "reference": "754bb4d075d7fb2b23b1a416802c0e45884df495"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/3d7f1240896a075aa23b13f82dfcbe165dadeef2",
-                "reference": "3d7f1240896a075aa23b13f82dfcbe165dadeef2",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/754bb4d075d7fb2b23b1a416802c0e45884df495",
+                "reference": "754bb4d075d7fb2b23b1a416802c0e45884df495",
                "shasum": ""
            },
            "require": {
                "barryvdh/reflection-docblock": "^2.0.6",
                "composer/composer": "^1.6",
-                "illuminate/console": "^5.5,<5.8",
-                "illuminate/filesystem": "^5.5,<5.8",
-                "illuminate/support": "^5.5,<5.8",
+                "illuminate/console": "^5.5,<5.9",
+                "illuminate/filesystem": "^5.5,<5.9",
+                "illuminate/support": "^5.5,<5.9",
                "php": ">=7"
            },
            "require-dev": {
                "doctrine/dbal": "~2.3",
-                "illuminate/config": "^5.1,<5.8",
-                "illuminate/view": "^5.1,<5.8",
+                "illuminate/config": "^5.1,<5.9",
+                "illuminate/view": "^5.1,<5.9",
                "phpro/grumphp": "^0.14",
                "phpunit/phpunit": "4.*",
                "scrutinizer/ocular": "~1.1",
@ -4960,7 +4964,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                },
                "laravel": {
                    "providers": [
@ -4995,7 +4999,7 @@
                "phpstorm",
                "sublime"
            ],
-            "time": "2018-12-19T12:12:05+00:00"
+            "time": "2019-02-18T19:54:27+00:00"
        },
        {
            "name": "barryvdh/reflection-docblock",
@ -6531,12 +6535,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "614a9db1df6be4349544311096f8d48ca067ccbb"
+                "reference": "4e04718428742618a4bf24dafca45b8645c9320d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/614a9db1df6be4349544311096f8d48ca067ccbb",
-                "reference": "614a9db1df6be4349544311096f8d48ca067ccbb",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4e04718428742618a4bf24dafca45b8645c9320d",
+                "reference": "4e04718428742618a4bf24dafca45b8645c9320d",
                "shasum": ""
            },
            "conflict": {
@ -6571,91 +6575,8 @@
                "doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
                "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1",
                "dompdf/dompdf": ">=0.6,<0.6.2",
-                "drupal/acquia_connector": ">=1,<1.16",
-                "drupal/autologout": ">=4,<4.5",
-                "drupal/backup_migrate": ">=3,<3.4",
-                "drupal/bealestreet": ">=1,<1.2",
-                "drupal/bible": ">=1,<1.7",
-                "drupal/bing_autosuggest_api": ">=1,<1.1",
-                "drupal/bootstrap": ">=3,<3.14",
-                "drupal/brilliant_gallery": ">=1,<1.10",
-                "drupal/ckeditor_uploadimage": ">=1,<1.5",
-                "drupal/cleantalk": ">=2,<2.7",
-                "drupal/cloud": ">=1,<1.7",
-                "drupal/commerce": ">=2,<2.9",
-                "drupal/commerce_custom_order_status": ">=1,<1.1",
-                "drupal/commerce_klarna_checkout": ">=1,<1.5",
-                "drupal/config_perms": ">=1,<1.1|>=2,<2.2",
-                "drupal/config_update": ">=1,<1.5",
                "drupal/core": ">=7,<7.62|>=8,<8.5.11|>=8.6,<8.6.10",
-                "drupal/datereminder": ">=1,<1.15",
-                "drupal/decoupled_router": ">=1,<1.2",
-                "drupal/domain_integration": ">=1,<1.2",
                "drupal/drupal": ">=7,<7.62|>=8,<8.5.11|>=8.6,<8.6.10",
-                "drupal/entity": ">=1,<1.9",
-                "drupal/entity_ref_tab_formatter": ">=1,<1.3",
-                "drupal/entityqueue_taxonomy": ">=1,<1.1",
-                "drupal/esign": ">=1,<1.10",
-                "drupal/eu_cookie_compliance": ">=1,<1.1",
-                "drupal/exif": ">=1,<1.1",
-                "drupal/feedback_collect": ">=1,<1.6",
-                "drupal/filefield_paths": ">=1,<1.1",
-                "drupal/filefield_sources": ">=1,<1.11",
-                "drupal/focal_point": ">=1,<1.2",
-                "drupal/fontawesome": ">=2,<2.12",
-                "drupal/fraction": ">=1,<1.2",
-                "drupal/gathercontent": ">=3,<3.5",
-                "drupal/genpass": ">=1,<1.1",
-                "drupal/hosting_https": ">=3,<3.170",
-                "drupal/jsonapi": ">=1,<1.16",
-                "drupal/lightbox2": ">=2,<2.11",
-                "drupal/link": ">=1,<1.6",
-                "drupal/litejazz": ">=2,<2.3",
-                "drupal/mailhandler": ">=2,<2.11",
-                "drupal/mass_pwreset": ">=1,<1.1",
-                "drupal/me": ">=1,<1.3",
-                "drupal/media": ">=2,<2.19",
-                "drupal/menu_export": ">=1,<1.2",
-                "drupal/metatag": ">=1,<1.8",
-                "drupal/miniorange_oauth_client": ">=1,<1.21",
-                "drupal/moneysuite": ">=10,<10.4",
-                "drupal/mosaik": ">=1,<1.2",
-                "drupal/netforum_authentication": ">=1,<1.1",
-                "drupal/newsflash": ">=2,<2.6",
-                "drupal/node_feedback": ">=1,<1.3",
-                "drupal/node_view_permissions": ">=1,<1.1",
-                "drupal/nucleus": ">=1,<1.6",
-                "drupal/nvp": ">=1,<1.1",
-                "drupal/panels_breadcrumbs": ">=2,<2.4",
-                "drupal/panopoly_core": ">=1,<1.49",
-                "drupal/paragraphs": ">=1,<1.6",
-                "drupal/password_policy": ">=1,<1.16",
-                "drupal/permissions_by_term": ">=1,<1.35",
-                "drupal/phonefield": ">=1,<1.1",
-                "drupal/phpconfig": ">=1,<1.1",
-                "drupal/preview_link": ">=1,<1.1",
-                "drupal/print": ">=2,<2.1",
-                "drupal/provision": ">=3,<3.170",
-                "drupal/pubdlcnt": ">=1,<1.3",
-                "drupal/renderkit": ">=1,<1.6",
-                "drupal/responsive_menus": ">=1,<1.7",
-                "drupal/restws": ">=2,<2.8",
-                "drupal/sagepay_payment": ">=1,<1.5",
-                "drupal/salesforce": ">=3,<3.1",
-                "drupal/search_api_solr": ">=1,<1.14",
-                "drupal/search_autocomplete": ">=4,<4.8",
-                "drupal/services_sso_client": ">=1,<1.6",
-                "drupal/stacks": ">=1,<1.1",
-                "drupal/tapestry": ">=2,<2.2",
-                "drupal/term_reference_tree": ">=1,<1.11",
-                "drupal/tfa_basic": ">=1,<1.1",
-                "drupal/tft": ">=1,<1.1",
-                "drupal/tmgmt": ">=1,<1.7",
-                "drupal/uuid": ">=1,<1.1",
-                "drupal/video": ">=1,<1.4",
-                "drupal/workbench_moderation": ">=1,<1.4",
-                "drupal/yandex_metrics": ">=3,<3.1",
-                "drupal/zircon": ">=1,<1.2",
                "erusev/parsedown": "<1.7",
                "ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.13.1|>=6,<6.7.9.1|>=6.8,<6.13.5.1|>=7,<7.2.4.1|>=7.3,<7.3.2.1",
                "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.6|>=5.4,<5.4.12.3|>=2011,<2017.12.4.3|>=2018.6,<2018.6.1.4|>=2018.9,<2018.9.1.3",
@ -6752,7 +6673,7 @@
                "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
                "tecnickcom/tcpdf": "<6.2.22",
                "thelia/backoffice-default-template": ">=2.1,<2.1.2",
-                "thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3",
+                "thelia/thelia": ">=2.1.0-beta1,<2.1.3|>=2.1,<2.1.2",
                "theonedemon/phpwhois": "<=4.2.5",
                "titon/framework": ">=0,<9.9.99",
                "truckersmp/phpwhois": "<=4.3.1",
@ -6810,7 +6731,7 @@
                }
            ],
            "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
-            "time": "2019-02-22T18:40:39+00:00"
+            "time": "2019-02-26T21:14:50+00:00"
        },
        {
            "name": "sebastian/code-unit-reverse-lookup",
--- a/config/firefly.php
+++ b/config/firefly.php
@ -93,7 +93,7 @@ return [
        'is_demo_site'     => false,
    ],
    'encryption'                   => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true,
-    'version'                      => '4.7.14',
+    'version'                      => '4.7.15',
    'api_version'                  => '0.9.2',
    'db_version'                   => 9,
    'maxUploadSize'                => 15242880,