Peter Papp 6a9edc49c0 Merge remote-tracking branch 'origin/bulk-operations' ...

# 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

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

..

js

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

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

lang

reading metadata in shared link RC

2020-08-25 12:36:21 +02:00

sass

- .multiselect-actions as position:fixed

2020-12-21 09:56:03 +01:00

views

upload-limit v0.3 solved the multiple DB querys,uploadLimit in config

2020-11-16 17:16:38 +01:00

babel.babel

v1.7 beta.ť

2020-07-17 08:39:01 +02:00