Merge remote-tracking branch 'origin/master' into oasis

# Conflicts: # public/chunks/admin-account.js # public/chunks/admin.js # public/chunks/app-appearance.js # public/chunks/app-billings.js # public/chunks/app-email.js # public/chunks/app-index.js # public/chunks/app-language.js # public/chunks/app-others.js # public/chunks/app-payments.js # public/chunks/app-setup.js # public/chunks/billings-detail.js # public/chunks/contact-us.js # public/chunks/dashboard.js # public/chunks/database.js # public/chunks/environment-setup.js # public/chunks/files.js # public/chunks/installation-disclaimer.js # public/chunks/invoices.js # public/chunks/page-edit.js # public/chunks/pages.js # public/chunks/plan-create.js # public/chunks/plan-delete.js # public/chunks/plan-settings.js # public/chunks/plan-subscribers.js # public/chunks/plans.js # public/chunks/platform.js # public/chunks/profile.js # public/chunks/settings-create-payment-methods.js # public/chunks/settings-invoices.js # public/chunks/settings-password.js # public/chunks/settings-payment-methods.js # public/chunks/settings.js # public/chunks/shared.js # public/chunks/shared/authenticate.js # public/chunks/shared/file-browser.js # public/chunks/shared/single-file.js # public/chunks/sign-in.js # public/chunks/sign-up.js # public/chunks/stripe-credentials.js # public/chunks/subscription-plans.js # public/chunks/subscription-service.js # public/chunks/upgrade-billing.js # public/chunks/upgrade-plan.js # public/chunks/user-create.js # public/chunks/user-delete.js # public/chunks/user-detail.js # public/chunks/user-invoices.js # public/chunks/user-password.js # public/chunks/user-storage.js # public/chunks/user-subscription.js # public/chunks/user.js # public/chunks/users.js # public/js/main.js # public/mix-manifest.json # resources/js/helpers.js
2026-05-22 04:54:43 +00:00 · 2021-05-10 17:15:37 +02:00
parent 73672bc023 dccf006f1e
commit ca255a7416
85 changed files with 338 additions and 1116 deletions
@@ -230,16 +230,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.180.3",
+            "version": "3.180.5",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "99c08e621c33ca4b2efa1df162c1ce0ecb3068dd"
+                "reference": "948a4defbe2a571cc4460725015b8e98b7060f2d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/99c08e621c33ca4b2efa1df162c1ce0ecb3068dd",
-                "reference": "99c08e621c33ca4b2efa1df162c1ce0ecb3068dd",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/948a4defbe2a571cc4460725015b8e98b7060f2d",
+                "reference": "948a4defbe2a571cc4460725015b8e98b7060f2d",
                "shasum": ""
            },
            "require": {
@@ -314,9 +314,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.180.3"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.180.5"
            },
-            "time": "2021-05-05T19:41:31+00:00"
+            "time": "2021-05-07T18:12:43+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@@ -7558,16 +7558,16 @@
        },
        {
            "name": "spatie/laravel-package-tools",
-            "version": "1.6.3",
+            "version": "1.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "97b53951e9623b3e38babf274c335913bf320a1a"
+                "reference": "a28108b61dac8a83de6c97f09a5a1e98f4d75522"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/97b53951e9623b3e38babf274c335913bf320a1a",
-                "reference": "97b53951e9623b3e38babf274c335913bf320a1a",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/a28108b61dac8a83de6c97f09a5a1e98f4d75522",
+                "reference": "a28108b61dac8a83de6c97f09a5a1e98f4d75522",
                "shasum": ""
            },
            "require": {
@@ -7606,7 +7606,7 @@
            ],
            "support": {
                "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.6.3"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.7.0"
            },
            "funding": [
                {
@@ -7614,7 +7614,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-04-27T06:17:34+00:00"
+            "time": "2021-05-06T21:49:32+00:00"
        },
        {
            "name": "spatie/laravel-tail",