Merge branch 'develop' into 5.8-dev

# Conflicts: # config/firefly.php # frontend/src/i18n/bg_BG/index.js # frontend/src/i18n/cs_CZ/index.js # frontend/src/i18n/da_DK/index.js # frontend/src/i18n/de_DE/index.js # frontend/src/i18n/el_GR/index.js # frontend/src/i18n/en_GB/index.js # frontend/src/i18n/en_US/index.js # frontend/src/i18n/es_ES/index.js # frontend/src/i18n/fi_FI/index.js # frontend/src/i18n/fr_FR/index.js # frontend/src/i18n/hu_HU/index.js # frontend/src/i18n/id_ID/index.js # frontend/src/i18n/it_IT/index.js # frontend/src/i18n/ja_JP/index.js # frontend/src/i18n/nb_NO/index.js # frontend/src/i18n/nl_NL/index.js # frontend/src/i18n/pl_PL/index.js # frontend/src/i18n/pt_BR/index.js # frontend/src/i18n/pt_PT/index.js # frontend/src/i18n/ro_RO/index.js # frontend/src/i18n/ru_RU/index.js # frontend/src/i18n/sk_SK/index.js # frontend/src/i18n/sl_SI/index.js # frontend/src/i18n/sv_SE/index.js # frontend/src/i18n/tr_TR/index.js # frontend/src/i18n/uk_UA/index.js # frontend/src/i18n/vi_VN/index.js # frontend/src/i18n/zh_CN/index.js # frontend/src/i18n/zh_TW/index.js # public/v1/js/create_transaction.js # public/v1/js/edit_transaction.js # public/v1/js/profile.js # resources/assets/js/locales/bg.json # resources/assets/js/locales/cs.json # resources/assets/js/locales/da.json # resources/assets/js/locales/de.json # resources/assets/js/locales/el.json # resources/assets/js/locales/en-gb.json # resources/assets/js/locales/en.json # resources/assets/js/locales/es.json # resources/assets/js/locales/fi.json # resources/assets/js/locales/fr.json # resources/assets/js/locales/hu.json # resources/assets/js/locales/id.json # resources/assets/js/locales/it.json # resources/assets/js/locales/ja.json # resources/assets/js/locales/nb.json # resources/assets/js/locales/nl.json # resources/assets/js/locales/pl.json # resources/assets/js/locales/pt.json # resources/assets/js/locales/ro.json # resources/assets/js/locales/ru.json # resources/assets/js/locales/sk.json # resources/assets/js/locales/sl.json # resources/assets/js/locales/sv.json # resources/assets/js/locales/tr.json # resources/assets/js/locales/uk.json # resources/assets/js/locales/vi.json # resources/assets/js/locales/zh-cn.json # resources/assets/js/locales/zh-tw.json # yarn.lock
2025-02-25 18:45:27 -06:00 · 2022-11-02 05:00:59 +01:00
parent a702662e88 e05c174e6d
commit 817a9f57c4
7 changed files with 193 additions and 3268 deletions
--- a/composer.lock
+++ b/composer.lock
@@ -1135,16 +1135,16 @@
        },
        {
            "name": "firebase/php-jwt",
-            "version": "v6.3.0",
+            "version": "v6.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "018dfc4e1da92ad8a1b90adc4893f476a3b41cb8"
+                "reference": "ddfaddcb520488b42bca3a75e17e9dd53c3667da"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/018dfc4e1da92ad8a1b90adc4893f476a3b41cb8",
-                "reference": "018dfc4e1da92ad8a1b90adc4893f476a3b41cb8",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/ddfaddcb520488b42bca3a75e17e9dd53c3667da",
+                "reference": "ddfaddcb520488b42bca3a75e17e9dd53c3667da",
                "shasum": ""
            },
            "require": {
@@ -1191,9 +1191,9 @@
            ],
            "support": {
                "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.3.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.3.1"
            },
-            "time": "2022-07-15T16:48:45+00:00"
+            "time": "2022-11-01T21:20:08+00:00"
        },
        {
            "name": "fruitcake/php-cors",
@@ -1855,16 +1855,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v9.37.0",
+            "version": "v9.38.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "0c9675abf6d966e834b2ebeca3319f524e07a330"
+                "reference": "abf198e443e06696af3f356b44de67c0fa516107"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/0c9675abf6d966e834b2ebeca3319f524e07a330",
-                "reference": "0c9675abf6d966e834b2ebeca3319f524e07a330",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/abf198e443e06696af3f356b44de67c0fa516107",
+                "reference": "abf198e443e06696af3f356b44de67c0fa516107",
                "shasum": ""
            },
            "require": {
@@ -2037,7 +2037,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2022-10-25T15:43:46+00:00"
+            "time": "2022-11-01T14:05:55+00:00"
        },
        {
            "name": "laravel/passport",
@@ -5411,6 +5411,7 @@
                    "type": "github"
                }
            ],
+            "abandoned": "spatie/laravel-data",
            "time": "2022-09-16T13:34:38+00:00"
        },
        {
@@ -8715,23 +8716,23 @@
        },
        {
            "name": "barryvdh/reflection-docblock",
-            "version": "v2.0.6",
+            "version": "v2.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
-                "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16"
+                "reference": "bf44b757feb8ba1734659029357646466ded673e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/6b69015d83d3daf9004a71a89f26e27d27ef6a16",
-                "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16",
+                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/bf44b757feb8ba1734659029357646466ded673e",
+                "reference": "bf44b757feb8ba1734659029357646466ded673e",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
            "require-dev": {
-                "phpunit/phpunit": "~4.0,<4.5"
+                "phpunit/phpunit": "^8.5.14|^9"
            },
            "suggest": {
                "dflydev/markdown": "~1.0",
@@ -8761,9 +8762,9 @@
                }
            ],
            "support": {
-                "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.0.6"
+                "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.0"
            },
-            "time": "2018-12-13T10:34:14+00:00"
+            "time": "2022-10-31T15:35:43+00:00"
        },
        {
            "name": "composer/pcre",