Merge remote-tracking branch 'origin/infinite_scroll' into api

# Conflicts:
#	config/vuefilemanager.php
#	package-lock.json
#	package.json
#	public/mix-manifest.json
#	resources/js/store/modules/fileBrowser.js
#	resources/js/store/modules/sharing.js
#	resources/js/store/modules/teams.js
#	resources/js/store/modules/userAuth.js
#	src/App/Socialite/Controllers/SocialiteCallbackController.php
#	src/Domain/Browsing/Controllers/BrowseTrashContentController.php
#	src/Domain/Browsing/Controllers/VisitorBrowseFolderController.php
#	src/Domain/Files/Controllers/UploadFileController.php
#	src/Domain/Items/Controllers/RenameFileOrFolderController.php
#	src/Support/helpers.php
This commit is contained in:
Čarodej
2022-05-24 10:22:21 +02:00
26 changed files with 356 additions and 104 deletions
+4 -4
View File
@@ -23,26 +23,26 @@
"resolve-url-loader": "^2.3.1",
"sass": "^1.49.11",
"sass-loader": "^8.0.2",
"tailwindcss": "^3.0.23",
"tailwindcss": "^3.0.24",
"tailwindcss-debug-screens": "^2.2.1",
"vue-loader": "^15.9.8",
"vue-template-compiler": "^2.6.14"
},
"dependencies": {
"@paypal/paypal-js": "^4.2.2",
"@stripe/stripe-js": "^1.26.0",
"@stripe/stripe-js": "^1.29.0",
"lodash": "^4.17.21",
"node-sass": "^4.14.1",
"pdfvuer": "^1.9.2",
"tailwind-scrollbar-hide": "^1.1.7",
"twemoji": "^13.1.1",
"v-click-outside": "^3.1.2",
"v-click-outside": "^3.2.0",
"vee-validate": "^3.4.14",
"vue": "^2.6.14",
"vue-feather-icons": "^5.1.0",
"vue-i18n": "^8.27.1",
"vue-recaptcha-v3": "^1.9.0",
"vue-router": "^3.5.3",
"vue-router": "^3.5.4",
"vuex": "^3.6.2"
}
}