Merge remote-tracking branch 'origin/bulk-operations'

Browse Source

# Conflicts:
#	app/Http/Helpers/helpers.php
#	config/vuefilemanager.php
#	public/chunks/app-others.js
#	public/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/FilesView/FileItemList.vue
#	resources/js/components/FilesView/FilePreview.vue
#	resources/js/helpers.js
#	resources/js/store/modules/fileFunctions.js

...

This commit is contained in:

Peter Papp

2020-12-21 17:02:49 +01:00

parent 30783d0e5d 96faf2de0e

commit 6a9edc49c0

167 changed files with 6839 additions and 3151 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

resources/js/components/FilesView/FileItemGrid.vue

+524 -407

File diff suppressed because it is too large Load Diff