diff --git a/.gitignore b/.gitignore index bbcbddff26a..56215087e67 100644 --- a/.gitignore +++ b/.gitignore @@ -173,3 +173,4 @@ core/js/mimetypelist.js # Tests - cypress cypress/snapshots cypress/videos +cypress/downloads \ No newline at end of file diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 2bff8e7ebd6..3c7e0936735 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -241,11 +241,6 @@ class Server { $this->server->addPlugin(new FakeLockerPlugin()); } - // Allow view-only plugin for webdav requests - $this->server->addPlugin(new ViewOnlyPlugin( - \OC::$server->getUserFolder(), - )); - if (BrowserErrorPagePlugin::isBrowserRequest($request)) { $this->server->addPlugin(new BrowserErrorPagePlugin()); } @@ -255,6 +250,11 @@ class Server { // wait with registering these until auth is handled and the filesystem is setup $this->server->on('beforeMethod:*', function () use ($root, $lazySearchBackend, $logger) { + // Allow view-only plugin for webdav requests + $this->server->addPlugin(new ViewOnlyPlugin( + \OC::$server->getUserFolder(), + )); + // custom properties plugin must be the last one $userSession = \OC::$server->getUserSession(); $user = $userSession->getUser(); diff --git a/apps/files_sharing/src/components/SharePermissionsEditor.vue b/apps/files_sharing/src/components/SharePermissionsEditor.vue deleted file mode 100644 index cc1a150ecc1..00000000000 --- a/apps/files_sharing/src/components/SharePermissionsEditor.vue +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue index 74bff87560a..6417ef0b6ea 100644 --- a/apps/files_sharing/src/components/SharingEntry.vue +++ b/apps/files_sharing/src/components/SharingEntry.vue @@ -46,6 +46,7 @@ @open-sharing-details="openShareDetailsForCustomSettings(share)" /> diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue index 4681e59391d..83e3dc3706f 100644 --- a/apps/files_sharing/src/views/SharingDetailsTab.vue +++ b/apps/files_sharing/src/views/SharingDetailsTab.vue @@ -19,6 +19,7 @@
{{ t('files_sharing', 'Hide download') }} - + {{ t('files_sharing', 'Allow download') }} @@ -162,21 +169,30 @@
+ :checked.sync="hasRead" + data-cy-files-sharing-share-permissions-checkbox="read"> {{ t('files_sharing', 'Read') }} - + {{ t('files_sharing', 'Create') }} - + {{ t('files_sharing', 'Edit') }} + :checked.sync="canReshare" + data-cy-files-sharing-share-permissions-checkbox="share"> {{ t('files_sharing', 'Share') }} - + {{ t('files_sharing', 'Delete') }}
@@ -199,10 +215,13 @@