diff --git a/changelog/unreleased/bugfix-pdf-loading-safari b/changelog/unreleased/bugfix-pdf-loading-safari new file mode 100644 index 00000000000..c9f991442e6 --- /dev/null +++ b/changelog/unreleased/bugfix-pdf-loading-safari @@ -0,0 +1,6 @@ +Bugfix: PDF loading Safari + +Loading PDF files with Safari has been fixed. + +https://github.com/owncloud/web/issues/9483 +https://github.com/owncloud/web/pull/9565 diff --git a/changelog/unreleased/bugfix-set-or-remove-expiration-date-on-group-share-not-possible b/changelog/unreleased/bugfix-set-or-remove-expiration-date-on-group-share-not-possible new file mode 100644 index 00000000000..6498ac95cec --- /dev/null +++ b/changelog/unreleased/bugfix-set-or-remove-expiration-date-on-group-share-not-possible @@ -0,0 +1,6 @@ +Bugfix: Set or remove expiration date on group share not possible + +We've fixed a bug where setting or removing an expiration on a group share wasn't possible. + +https://github.com/owncloud/web/pull/9513 +https://github.com/owncloud/web/issues/8419 diff --git a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue index 9def78bb585..0bc6ac52711 100644 --- a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue +++ b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue @@ -340,6 +340,10 @@ export default defineComponent({ return formatRelativeDateFromJSDate(new Date(date), currentLanguage) } const getTotalQuota = (space: SpaceResource) => { + if (space.spaceQuota.total === 0) { + return $gettext('Unrestricted') + } + return formatFileSize(space.spaceQuota.total, currentLanguage) } const getUsedQuota = (space: SpaceResource) => { diff --git a/packages/web-app-files/src/components/Search/List.vue b/packages/web-app-files/src/components/Search/List.vue index 52617cf44a7..1fdade1e960 100644 --- a/packages/web-app-files/src/components/Search/List.vue +++ b/packages/web-app-files/src/components/Search/List.vue @@ -15,6 +15,7 @@ :items="availableTags" :option-filter-label="$gettext('Filter tags')" :show-option-filter="true" + :close-on-click="true" class="files-search-filter-tags oc-mr-s" display-name-attribute="label" filter-name="tags" diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/EditDropdown.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/EditDropdown.vue index f2fe4eab03c..08cad53e625 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/EditDropdown.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/EditDropdown.vue @@ -28,7 +28,11 @@ @click="togglePopover" > - + @@ -186,10 +190,7 @@ export default defineComponent({ }, isExpirationSupported() { - return ( - (this.editingUser && this.userExpirationDate) || - (this.editingGroup && this.groupExpirationDate) - ) + return this.editingUser || this.editingGroup }, isExpirationDateSet() { @@ -248,14 +249,14 @@ export default defineComponent({ isExpirationDateEnforced() { if (this.editingUser) { - return this.userExpirationDate.enforced + return this.userExpirationDate?.enforced } if (this.editingGroup) { - return this.groupExpirationDate.enforced + return this.groupExpirationDate?.enforced } - return this.userExpirationDate.enforced || this.groupExpirationDate.enforced + return this.userExpirationDate?.enforced || this.groupExpirationDate?.enforced }, maxExpirationDate() { diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.vue index e1f94bda6dd..38c67771d14 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.vue @@ -1,5 +1,5 @@