Merge branch 'master' of http://47.99.244.21:9999/root/joshine

.gitignore

@@ -11,3 +11,6 @@ media
 opt
 opt
 code
 code
 /app/etc/env.php
 /app/etc/env.php
+generated
+var
+.idea

composer.json

@@ -78,7 +78,8 @@
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "~4.1.0",
         "ramsey/uuid": "~4.1.0",
-        "swissup/breeze-blank": "1.1.7",
+        "rltsquare/product-review-images": "1.0.6",
+        "swissup/breeze-blank": "1.2.0",
         "symfony/console": "~4.4.0",
         "symfony/console": "~4.4.0",
         "symfony/event-dispatcher": "~4.4.0",
         "symfony/event-dispatcher": "~4.4.0",
         "symfony/process": "~4.4.0",
         "symfony/process": "~4.4.0",
@@ -388,7 +389,5 @@
             "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
             "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
         }
         }
     },
     },
-    "prefer-stable": true,
-    "repositories": {
-    }
+    "prefer-stable": true
+}
\ No newline at end of file
-}

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
         "This file is @generated automatically"
     ],
     ],
-    "content-hash": "5c2c36961f33f7cdba75a19227958c7b",
+    "content-hash": "9d815419a69eca3c28e67043d0093557",
     "packages": [
     "packages": [
         {
         {
             "name": "aws/aws-crt-php",
             "name": "aws/aws-crt-php",
@@ -6082,28 +6082,22 @@
         },
         },
         {
         {
             "name": "swissup/breeze-blank",
             "name": "swissup/breeze-blank",
-            "version": "1.1.7",
+            "version": "1.2.0",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/breezefront/breeze-blank.git",
                 "url": "https://github.com/breezefront/breeze-blank.git",
-                "reference": "d9dc31485979eaf13e61abddc30b0f53f6afe364"
+                "reference": "887a9a149b1c3215f43b7c7aaaf0ee41d87e52f8"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/breezefront/breeze-blank/zipball/d9dc31485979eaf13e61abddc30b0f53f6afe364",
-                "reference": "d9dc31485979eaf13e61abddc30b0f53f6afe364",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "url": "https://api.github.com/repos/breezefront/breeze-blank/zipball/887a9a149b1c3215f43b7c7aaaf0ee41d87e52f8",
+                "reference": "887a9a149b1c3215f43b7c7aaaf0ee41d87e52f8",
+                "shasum": ""
             },
             },
             "require": {
             "require": {
-                "swissup/module-breeze": "^1.13.6",
-                "swissup/module-breeze-integrations": "^1.2.3",
-                "swissup/theme-frontend-breeze-blank": "^1.1.7"
+                "swissup/module-breeze": "^1.13.9",
+                "swissup/module-breeze-integrations": "^1.2.4",
+                "swissup/theme-frontend-breeze-blank": "^1.2.0"
             },
             },
             "type": "metapackage",
             "type": "metapackage",
             "notification-url": "https://packagist.org/downloads/",
             "notification-url": "https://packagist.org/downloads/",
@@ -6112,9 +6106,9 @@
             ],
             ],
             "description": "Breeze Blank Theme",
             "description": "Breeze Blank Theme",
             "support": {
             "support": {
-                "source": "https://github.com/breezefront/breeze-blank/tree/1.1.7"
+                "source": "https://github.com/breezefront/breeze-blank/tree/1.2.0"
             },
             },
-            "time": "2022-08-10T07:33:13+00:00"
+            "time": "2022-08-25T13:49:53+00:00"
         },
         },
         {
         {
             "name": "swissup/module-breeze",
             "name": "swissup/module-breeze",

generated/.htaccess

-<IfVersion < 2.4>
-    order allow,deny
-    deny from all
-</IfVersion>
-<IfVersion >= 2.4>
-    Require all denied
-</IfVersion>
-

var/.htaccess

-<IfVersion < 2.4>
-    order allow,deny
-    deny from all
-</IfVersion>
-<IfVersion >= 2.4>
-    Require all denied
-</IfVersion>
-

vendor/autoload.php

@@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
 
 
 require_once __DIR__ . '/composer/autoload_real.php';
 require_once __DIR__ . '/composer/autoload_real.php';
 
 
-return ComposerAutoloaderInit8c29683d703e0ac6b351ddf0617cf78c::getLoader();
+return ComposerAutoloaderInitb71ce7c407b65980cf51508f463c8dcf::getLoader();