Merge branch 'develop' into 5.8-dev

# Conflicts: # composer.lock # yarn.lock
2025-01-26 08:16:32 -06:00 · 2022-07-09 17:25:39 +02:00 · 2022-07-09 17:25:39 +02:00 · 9118a153d5
commit 9118a153d5
parent 56ff25285c b97988a597
8 changed files with 201 additions and 190 deletions
--- a/composer.json
+++ b/composer.json
@ -96,14 +96,14 @@
    "league/commonmark": "2.*",
    "league/csv": "^9.7",
    "league/fractal": "0.*",
-    "nunomaduro/collision": "^6.1",
+    "nunomaduro/collision": "^6.2",
    "pragmarx/google2fa": "^8.0",
-    "predis/predis": "^1.1",
+    "predis/predis": "^2.0",
    "psr/log": "<4",
    "ramsey/uuid": "^4.3",
    "rcrowe/twigbridge": "^0.14",
    "spatie/data-transfer-object": "^3.8",
-    "spatie/laravel-ignition": "^1.2",
+    "spatie/laravel-ignition": "^1.3",
    "symfony/http-client": "^6.0",
    "symfony/mailgun-mailer": "^6.0"
  },
--- a/composer.lock
+++ b/composer.lock
--- a/package.json
+++ b/package.json
@ -10,7 +10,7 @@
    },
    "devDependencies": {
        "@johmun/vue-tags-input": "^2",
-        "@vue/compiler-sfc": "^3.2.36",
+        "@vue/compiler-sfc": "^3.2.37",
        "axios": "^0.27",
        "bootstrap-sass": "^3",
        "cross-env": "^7.0",
--- a/public/v1/js/app_vue.js
+++ b/public/v1/js/app_vue.js
--- a/public/v1/js/app_vue.js.LICENSE.txt
+++ b/public/v1/js/app_vue.js.LICENSE.txt
@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.6.14
- * (c) 2014-2021 Evan You
+ * Vue.js v2.7.2
+ * (c) 2014-2022 Evan You
 * Released under the MIT License.
 */
--- a/public/v1/js/create_transaction.js
+++ b/public/v1/js/create_transaction.js
--- a/public/v1/js/edit_transaction.js
+++ b/public/v1/js/edit_transaction.js
--- a/public/v1/js/profile.js
+++ b/public/v1/js/profile.js