mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-18 08:12:15 +00:00
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:
@@ -61,6 +61,10 @@ return [
|
||||
],
|
||||
],
|
||||
|
||||
'paginate' => [
|
||||
'perPage' => 8,
|
||||
],
|
||||
|
||||
// The update versions which need to run upgrade process
|
||||
'updates' => [
|
||||
'2_0_10',
|
||||
|
||||
Reference in New Issue
Block a user