Peter Papp 2f89f6303a Merge branch 'upload-limit' ...

# 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 18:19:37 +01:00

..

components

Merge branch 'upload-limit'

2020-12-21 18:19:37 +01:00

i18n

Merge branch 'upload-limit'

2020-12-21 18:19:37 +01:00

store

merge local with remote changes (Peter)

2020-12-21 11:31:50 +01:00

views

Merge branch 'upload-limit'

2020-12-21 18:19:37 +01:00

App.vue

- .multiselect-actions as position:fixed

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

bootstrap.js

Initial commit

2020-03-10 19:00:32 +01:00

bus.js

Initial commit

2020-03-10 19:00:32 +01:00

helpers.js

Merge branch 'upload-limit'

2020-12-21 18:19:37 +01:00

main.js

add preview&Sorting menu for mobile version, refacoring sorting URI

2020-12-09 18:24:05 +01:00

router.js

Trash moved to file page

2020-11-21 18:02:46 +01:00