Čarodej 4396965d4d Merge remote-tracking branch 'origin/folders_upload' into folder_upload_v2 ...

# Conflicts:
#	composer.lock
#	config/language-translations.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/DesktopToolbar.vue
#	resources/js/helpers.js
#	resources/js/store/modules/fileFunctions.js
#	src/Domain/Files/Actions/UploadFileAction.php
#	src/Domain/Files/Requests/UploadRequest.php
#	tests/Domain/Admin/AdminTest.php
#	tests/Domain/Files/FileTest.php
#	tests/Domain/Folders/FolderTest.php
#	tests/Domain/Sharing/VisitorManipulatingTest.php
#	tests/Domain/Traffic/TrafficTest.php
#	tests/Domain/Trash/TrashTest.php
#	tests/Domain/Zip/UserZippingTest.php

2022-01-24 08:05:04 +01:00

..

components

Merge remote-tracking branch 'origin/folders_upload' into folder_upload_v2

2022-01-24 08:05:04 +01:00

helpers

confirmation popup refactoring

2022-01-22 13:43:24 +01:00

i18n

language fix

2021-06-23 18:15:44 +02:00

routes

admin dashboard refactoring

2022-01-12 13:58:51 +01:00

store

Merge remote-tracking branch 'origin/folders_upload' into folder_upload_v2

2022-01-24 08:05:04 +01:00

views

info sidebar refactoring

2022-01-22 12:31:27 +01:00

App.vue

UI setup for emojis and theme mode

2022-01-20 17:05:48 +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 remote-tracking branch 'origin/folders_upload' into folder_upload_v2

2022-01-24 08:05:04 +01:00

main.js

- Frontend restriction alerts

2022-01-05 18:57:02 +01:00

router.js

invitation page implementation

2021-10-25 17:14:27 +02:00