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

Browse Source

# Conflicts:
#	.env.testing
#	README.md
#	composer.json
#	composer.lock
#	config/language-translations.php
#	config/vuefilemanager.php
#	public/chunks/admin.js
#	public/chunks/database.js
#	public/chunks/demo.js
#	public/chunks/files.js
#	public/chunks/my-shared-items.js
#	public/chunks/platform.js
#	public/chunks/recent-uploads.js
#	public/chunks/settings-storage.js
#	public/chunks/settings.js
#	public/chunks/shared.js
#	public/chunks/shared/browser.js
#	public/chunks/shared/single-file.js
#	public/chunks/sign-in.js
#	public/chunks/status-check.js
#	public/chunks/trash.js
#	public/chunks/user-storage.js
#	public/css/tailwind.css
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/Subscription/UserFixedSubscriptionDetail.vue
#	resources/js/store/modules/userAuth.js
#	resources/js/views/Admin.vue
#	resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue
#	resources/js/views/Admin/Plans.vue
#	resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
#	resources/js/views/Admin/Settings/AppSettingsTabs/SignInUp.vue
#	resources/js/views/Demo.vue
#	resources/js/views/Frontpage/Homepage.vue
#	resources/js/views/Platform.vue
#	resources/views/index.blade.php
#	src/App/Console/Commands/SetupWebsocketEnvironment.php
#	src/App/Users/Models/UserLimitation.php
#	src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
#	src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
#	src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php
#	src/Domain/RemoteUpload/Requests/RemoteUploadRequest.php
#	src/Domain/Settings/Controllers/StoreBroadcastServiceCredentialsController.php
#	src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php
#	src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php
#	src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
#	src/Support/Upgrading/Controllers/UpgradingVersionsController.php

...

This commit is contained in:

Čarodej

2022-05-10 16:06:09 +02:00

parent b8101087a7 ed17ed1a79

commit 9720d34d6a

45 changed files with 593 additions and 199 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

public/chunks/app-sign-in-out.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/billing.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/homepage.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/payments/settings.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/plan-create/fixed.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/plans.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/request-upload.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/request.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/shared-with-me.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/sign-up.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/team-folders.js vendored

File diff suppressed because one or more lines are too long

2

public/chunks/user-subscription.js vendored

File diff suppressed because one or more lines are too long