Merge branch 'area17:3.x' into feature/allow-to-display-the-date-of-the-uploaded-file

Author: gilbo75

Diff for: CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to `twill` will be documented in this file.
 
+## 3.5.2
+
+### Fixed
+
+- Fix cropper regression (likely a from a recent browser update) by [@13twelve](https://github.com/13twelve) in [#2744](https://github.com/area17/twill/pull/2744)
+
+
 ## 3.5.1
 
 ### Fixed

Diff for: docs/content/1_docs/5_block-editor/02_creating-a-block-editor.md

@@ -393,6 +393,8 @@ See also [Default Configuration](./11_default-configuration.md).
 
 If the `resource_path('assets/admin/icons')` directory contains a `my-custom-icon.svg` file, you can use this icon in your block by using its basename: `@twillBlockIcon('my-custom-icon')`.
 
+In order to make the icons appear in the CMS, you'll need to run `php artisan twill:build`
+
 ## Use Block traits in your Model and Repository
 
 Now, to handle the block data you must integrate it with your module. *Use* the *Blocks* traits in the Model and Repository associated with your module.

Diff for: docs/content/2_guides/4_creating_custom_components_form_fields_and_blocks.md

@@ -409,7 +409,7 @@ npm install vue-numeric --save
 ### Blade view
 
 :::filename:::
-`resources/views/admin/partials/form/_custom_number.blade.php`
+`resources/views/twill/partials/form/_custom_number.blade.php`
 :::#filename:::
 
 ```blade

Diff for: package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@area17/twill",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "private": true,
   "scripts": {
     "inspect": "vue-cli-service inspect --mode production",

Diff for: package.json

@@ -18,7 +18,7 @@ public function index(?int $parentModuleId = null): mixed
 
     public function editSingleton()
     {
-        $model = "App\\Models\\{$this->getModelName()}";
+        $model = $this->getRepository()->getBaseModel()::class;
 
         if (!class_exists($model)) {
             $model = TwillCapsules::getCapsuleForModel($this->modelName)->getModel();

Diff for: src/Http/Controllers/Admin/SingletonModuleController.php

@@ -65,7 +65,7 @@ class TwillServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    public const VERSION = '3.5.1';
+    public const VERSION = '3.5.2';
 
     /**
      * Service providers to be registered.

Diff for: src/TwillServiceProvider.php

@@ -11,25 +11,25 @@
   "Inter-MediumItalic.woff2": "/assets/twill/fonts/Inter-MediumItalic.7cd62035.woff2",
   "Inter-Regular.woff": "/assets/twill/fonts/Inter-Regular.4f8a0d7b.woff",
   "Inter-Regular.woff2": "/assets/twill/fonts/Inter-Regular.a2b4ebbf.woff2",
-  "chunk-common.css": "/assets/twill/css/chunk-common.7a4dc65d.css",
-  "chunk-common.js": "/assets/twill/js/chunk-common.56df95e8.js",
+  "chunk-common.css": "/assets/twill/css/chunk-common.eea3635b.css",
+  "chunk-common.js": "/assets/twill/js/chunk-common.03a98958.js",
   "chunk-vendors.css": "/assets/twill/css/chunk-vendors.96caa2e9.css",
   "chunk-vendors.js": "/assets/twill/js/chunk-vendors.a20b3d59.js",
   "icons-files.php": "/views/partials/icons/icons-files-svg.blade.php",
   "icons-wysiwyg.php": "/views/partials/icons/icons-wysiwyg-svg.blade.php",
   "icons.php": "/views/partials/icons/icons-svg.blade.php",
   "main-buckets.css": "/assets/twill/css/main-buckets.bd3bf89d.css",
   "main-buckets.html": "/main-buckets.html",
-  "main-buckets.js": "/assets/twill/js/main-buckets.31cc381c.js",
+  "main-buckets.js": "/assets/twill/js/main-buckets.a5ef5711.js",
   "main-dashboard.css": "/assets/twill/css/main-dashboard.08050331.css",
   "main-dashboard.html": "/main-dashboard.html",
-  "main-dashboard.js": "/assets/twill/js/main-dashboard.aa3bc9a4.js",
+  "main-dashboard.js": "/assets/twill/js/main-dashboard.a2ec0df9.js",
   "main-form.css": "/assets/twill/css/main-form.861de3c5.css",
   "main-form.html": "/main-form.html",
-  "main-form.js": "/assets/twill/js/main-form.ccdbb5fc.js",
+  "main-form.js": "/assets/twill/js/main-form.924688f6.js",
   "main-free.html": "/main-free.html",
-  "main-free.js": "/assets/twill/js/main-free.f7ab3d06.js",
+  "main-free.js": "/assets/twill/js/main-free.cdce1f23.js",
   "main-listing.css": "/assets/twill/css/main-listing.ecd5753d.css",
   "main-listing.html": "/main-listing.html",
-  "main-listing.js": "/assets/twill/js/main-listing.47d17fb9.js"
+  "main-listing.js": "/assets/twill/js/main-listing.01ea5744.js"
 }