From 626fd55d5798c92c82eb39ca94c385f1aab9ccc6 Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Tue, 20 Feb 2024 10:59:25 +0100 Subject: [PATCH 1/2] chore(deps): Bump @nextcloud/vue from 8.6.2 to 8.7.0 Signed-off-by: Maksim Sukharev --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 183a72e4f9e..76b03ec7ae2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@nextcloud/paths": "^2.1.0", "@nextcloud/router": "^3.0.0", "@nextcloud/upload": "^1.0.5", - "@nextcloud/vue": "^8.6.2", + "@nextcloud/vue": "^8.7.0", "crypto-js": "^4.2.0", "debounce": "^2.0.0", "emoji-mart-vue-fast": "^15.0.0", @@ -3910,9 +3910,9 @@ } }, "node_modules/@nextcloud/vue": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.6.2.tgz", - "integrity": "sha512-tlT9OBkuNIKOAajqhmL2owM0KpQzc9Uw+SZ4iOS1AuxSgJoqKU5v2784EXU33xP6kCgneyQt/zd6sxfAr0JzMg==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.7.0.tgz", + "integrity": "sha512-0SPazCAA7MjvhbNTxZv1kIf6LZ7C9XUq0eovEnBjeD95sd7yu98i4vdPwJw1mIPIaT78rUv4uhUDLxxnS2/IUQ==", "dependencies": { "@floating-ui/dom": "^1.1.0", "@linusborg/vue-simple-portal": "^0.1.5", @@ -23487,9 +23487,9 @@ } }, "@nextcloud/vue": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.6.2.tgz", - "integrity": "sha512-tlT9OBkuNIKOAajqhmL2owM0KpQzc9Uw+SZ4iOS1AuxSgJoqKU5v2784EXU33xP6kCgneyQt/zd6sxfAr0JzMg==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.7.0.tgz", + "integrity": "sha512-0SPazCAA7MjvhbNTxZv1kIf6LZ7C9XUq0eovEnBjeD95sd7yu98i4vdPwJw1mIPIaT78rUv4uhUDLxxnS2/IUQ==", "requires": { "@floating-ui/dom": "^1.1.0", "@linusborg/vue-simple-portal": "^0.1.5", diff --git a/package.json b/package.json index c2925d01c45..1b49a1501d5 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@nextcloud/paths": "^2.1.0", "@nextcloud/router": "^3.0.0", "@nextcloud/upload": "^1.0.5", - "@nextcloud/vue": "^8.6.2", + "@nextcloud/vue": "^8.7.0", "crypto-js": "^4.2.0", "debounce": "^2.0.0", "emoji-mart-vue-fast": "^15.0.0", From ba55ed51d7686b7917089241044959ebfc689245 Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Tue, 20 Feb 2024 11:34:15 +0100 Subject: [PATCH 2/2] chore: remove upstream patches Signed-off-by: Maksim Sukharev --- .../BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue | 5 ----- src/components/ConversationSettings/DangerZone.vue | 5 ----- src/components/NewMessage/NewMessage.vue | 5 ----- src/components/PermissionsEditor/PermissionsEditor.vue | 5 ----- 4 files changed, 20 deletions(-) diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue index 786f55d232e..24cc89a3df4 100644 --- a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue +++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue @@ -385,9 +385,4 @@ export default { .delete { margin-right: auto; } - -// TODO remove after https://github.com/nextcloud-libraries/nextcloud-vue/issues/5228 -:deep(.modal-wrapper--small .modal-container) { - width: 400px !important; -} diff --git a/src/components/ConversationSettings/DangerZone.vue b/src/components/ConversationSettings/DangerZone.vue index aac6dc0775f..9d09bada2d9 100644 --- a/src/components/ConversationSettings/DangerZone.vue +++ b/src/components/ConversationSettings/DangerZone.vue @@ -235,11 +235,6 @@ h4 { color: var(--color-text-maxcontrast); } &__dialog { - // TODO remove after https://github.com/nextcloud-libraries/nextcloud-vue/issues/5228 - :deep(.modal-wrapper--small .modal-container) { - width: 400px !important; - } - :deep(.modal-container) { padding-block: 4px 8px; padding-inline: 12px 8px; diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue index 09d16fa9021..7fafebcd01c 100644 --- a/src/components/NewMessage/NewMessage.vue +++ b/src/components/NewMessage/NewMessage.vue @@ -871,11 +871,6 @@ export default { const possibleMentions = response.data.ocs.data possibleMentions.forEach(possibleMention => { - // TODO fix backend for userMention - if (!possibleMention.title && possibleMention.label) { - possibleMention.title = possibleMention.label - } - // Set icon for candidate mentions that are not for users. if (possibleMention.source === 'calls') { possibleMention.icon = 'icon-user-forced-white' diff --git a/src/components/PermissionsEditor/PermissionsEditor.vue b/src/components/PermissionsEditor/PermissionsEditor.vue index 9febcc8db20..3edd391debe 100644 --- a/src/components/PermissionsEditor/PermissionsEditor.vue +++ b/src/components/PermissionsEditor/PermissionsEditor.vue @@ -266,9 +266,4 @@ export default { .button-update-permission { margin: 0 auto; } - -// TODO remove after https://github.com/nextcloud-libraries/nextcloud-vue/issues/5228 -:deep(.modal-wrapper--small .modal-container) { - width: 400px !important; -}