From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 30 Jan 2024 13:43:53 +0000 (+0100)
Subject: Merge branch 'backpack5' into backpack6
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=339fd0a0ad8b9819bb87a5dd2b75cb94a6d33f18;p=cubist_cms-back.git

Merge branch 'backpack5' into backpack6

# Conflicts:
#	composer.json
---

339fd0a0ad8b9819bb87a5dd2b75cb94a6d33f18
diff --cc composer.json
index 01d5bf7,e72209e..c7056c1
--- a/composer.json
+++ b/composer.json
@@@ -24,33 -24,34 +24,33 @@@
          "ext-libxml": "*",
          "ext-json": "*",
          "ext-redis": "*",
 -        "backpack/crud": "^5.6.1",
 -        "backpack/backupmanager": "^v3.0.9",
 -        "backpack/logmanager": "^v4.0.10",
 -        "backpack/permissionmanager": "^6.0.16",
 -        "backpack/pro": "^1.6.6",
 -        "cubist/cms-front": "dev-backpack5",
 +        "backpack/crud": "^6.4.2",
 +        "backpack/backupmanager": "^v5.0.0",
 +        "backpack/logmanager": "^v5.0.1",
 +        "backpack/permissionmanager": "^7.1.1",
 +        "backpack/pro": "^2.0.20",
 +        "cubist/cms-front": "dev-master",
          "cubist/util": "dev-master",
 -        "cubist/locale": "dev-backpack5",
 +        "cubist/locale": "dev-master",
          "cubist/laravel-backpack-dropzone-field": "dev-master",
 -        "spatie/laravel-translatable": "^6.5.0",
 +        "spatie/laravel-translatable": "^6.5.5",
          "venturecraft/revisionable": "^1.40.0",
          "cviebrock/eloquent-sluggable": "^10.0.0",
 -        "lavary/laravel-menu": "^v1.8.3",
 +        "lavary/laravel-menu": "^v1.8.4",
          "graham-campbell/markdown": "^v15.1.0",
          "barryvdh/laravel-debugbar": "^v3.9.2",
 -        "league/commonmark": "^2.4.0",
 -        "cviebrock/laravel-elasticsearch": "^10.0.0",
 -        "spatie/laravel-honeypot": "^4.3.2",
 +        "league/commonmark": "^2.4.1",
 +        "spatie/laravel-honeypot": "^4.4.0",
          "chrisjean/php-ico": "^1.0.4",
 -        "swayok/alternative-laravel-cache": "^6.1.10",
 +        "swayok/alternative-laravel-cache": "^6.1.13",
          "cache/redis-adapter": "^1.2.0",
 -        "backpack/revise-operation": "^1.0.12",
 -        "digitallyhappy/toggle-field-for-backpack": "^2.0.1",
 +        "backpack/revise-operation": "^2.0.0",
 +        "calebporzio/parental": "^v1.3.3",
-         "laravel/framework": "^v10.35.0",
+         "laravel/framework": "^v10.40.0",
 -        "laravel-lang/lang": "12.19.4",
 -        "laravel-lang/publisher": "^v14.7.4",
 -        "spatie/laravel-permission": "^4.4.3|^5.11.0",
 -        "mews/purifier": "^3.4"
 +        "laravel-lang/lang": "^13.11.0",
 +        "laravel-lang/publisher": "^v15.0.2",
 +        "spatie/laravel-permission": "^4.4.3|^5.11.0|^6.2.0",
 +        "mews/purifier": "^3.4.1"
      },
      "require-dev": {
          "filp/whoops": "^2.15.1",