diff options
-rw-r--r-- | appinfo/routes/routesRoomController.php | 31 | ||||
-rw-r--r-- | appinfo/routes/routesSettingsController.php | 2 | ||||
-rw-r--r-- | appinfo/routes/routesSignalingController.php | 5 | ||||
-rw-r--r-- | appinfo/routes/routesTempAvatarController.php | 2 | ||||
-rw-r--r-- | l10n/de.js | 2 | ||||
-rw-r--r-- | l10n/de.json | 2 | ||||
-rw-r--r-- | package-lock.json | 117 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/components/CallView/shared/LocalMediaControls.vue | 4 | ||||
-rw-r--r-- | src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue | 2 | ||||
-rw-r--r-- | src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js | 4 | ||||
-rw-r--r-- | src/components/TopBar/TopBar.vue | 4 |
12 files changed, 106 insertions, 71 deletions
diff --git a/appinfo/routes/routesRoomController.php b/appinfo/routes/routesRoomController.php index 5f1d9aaf6..e065a39bc 100644 --- a/appinfo/routes/routesRoomController.php +++ b/appinfo/routes/routesRoomController.php @@ -34,40 +34,71 @@ $requirementsWithToken = [ return [ 'ocs' => [ + /** @see \OCA\Talk\Controller\RoomController::getRooms() */ ['name' => 'Room#getRooms', 'url' => '/api/{apiVersion}/room', 'verb' => 'GET', 'requirements' => $requirements], + /** @see \OCA\Talk\Controller\RoomController::getListedRooms() */ ['name' => 'Room#getListedRooms', 'url' => '/api/{apiVersion}/listed-room', 'verb' => 'GET', 'requirements' => $requirements], + /** @see \OCA\Talk\Controller\RoomController::createRoom() */ ['name' => 'Room#createRoom', 'url' => '/api/{apiVersion}/room', 'verb' => 'POST', 'requirements' => $requirements], + /** @see \OCA\Talk\Controller\RoomController::getSingleRoom() */ ['name' => 'Room#getSingleRoom', 'url' => '/api/{apiVersion}/room/{token}', 'verb' => 'GET', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::renameRoom() */ ['name' => 'Room#renameRoom', 'url' => '/api/{apiVersion}/room/{token}', 'verb' => 'PUT', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::deleteRoom() */ ['name' => 'Room#deleteRoom', 'url' => '/api/{apiVersion}/room/{token}', 'verb' => 'DELETE', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::makePublic() */ ['name' => 'Room#makePublic', 'url' => '/api/{apiVersion}/room/{token}/public', 'verb' => 'POST', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::makePrivate() */ ['name' => 'Room#makePrivate', 'url' => '/api/{apiVersion}/room/{token}/public', 'verb' => 'DELETE', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setDescription() */ ['name' => 'Room#setDescription', 'url' => '/api/{apiVersion}/room/{token}/description', 'verb' => 'PUT', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setReadOnly() */ ['name' => 'Room#setReadOnly', 'url' => '/api/{apiVersion}/room/{token}/read-only', 'verb' => 'PUT', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setListable() */ ['name' => 'Room#setListable', 'url' => '/api/{apiVersion}/room/{token}/listable', 'verb' => 'PUT', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setPassword() */ ['name' => 'Room#setPassword', 'url' => '/api/{apiVersion}/room/{token}/password', 'verb' => 'PUT', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setPermissions() */ ['name' => 'Room#setPermissions', 'url' => '/api/{apiVersion}/room/{token}/permissions/{mode}', 'verb' => 'PUT', 'requirements' => array_merge($requirementsWithToken, [ 'mode' => '^(call|default)$', ])], + /** @see \OCA\Talk\Controller\RoomController::getParticipants() */ ['name' => 'Room#getParticipants', 'url' => '/api/{apiVersion}/room/{token}/participants', 'verb' => 'GET', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::addParticipantToRoom() */ ['name' => 'Room#addParticipantToRoom', 'url' => '/api/{apiVersion}/room/{token}/participants', 'verb' => 'POST', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::removeSelfFromRoom() */ ['name' => 'Room#removeSelfFromRoom', 'url' => '/api/{apiVersion}/room/{token}/participants/self', 'verb' => 'DELETE', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::removeAttendeeFromRoom() */ ['name' => 'Room#removeAttendeeFromRoom', 'url' => '/api/{apiVersion}/room/{token}/attendees', 'verb' => 'DELETE', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setAttendeePermissions() */ ['name' => 'Room#setAttendeePermissions', 'url' => '/api/{apiVersion}/room/{token}/attendees/permissions', 'verb' => 'PUT', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setAllAttendeesPermissions() */ ['name' => 'Room#setAllAttendeesPermissions', 'url' => '/api/{apiVersion}/room/{token}/attendees/permissions/all', 'verb' => 'PUT', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::joinRoom() */ ['name' => 'Room#joinRoom', 'url' => '/api/{apiVersion}/room/{token}/participants/active', 'verb' => 'POST', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::resendInvitations() */ ['name' => 'Room#resendInvitations', 'url' => '/api/{apiVersion}/room/{token}/participants/resend-invitations', 'verb' => 'POST', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::leaveRoom() */ ['name' => 'Room#leaveRoom', 'url' => '/api/{apiVersion}/room/{token}/participants/active', 'verb' => 'DELETE', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::promoteModerator() */ ['name' => 'Room#promoteModerator', 'url' => '/api/{apiVersion}/room/{token}/moderators', 'verb' => 'POST', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::demoteModerator() */ ['name' => 'Room#demoteModerator', 'url' => '/api/{apiVersion}/room/{token}/moderators', 'verb' => 'DELETE', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::addToFavorites() */ ['name' => 'Room#addToFavorites', 'url' => '/api/{apiVersion}/room/{token}/favorite', 'verb' => 'POST', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::removeFromFavorites() */ ['name' => 'Room#removeFromFavorites', 'url' => '/api/{apiVersion}/room/{token}/favorite', 'verb' => 'DELETE', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::getParticipantByDialInPin() */ ['name' => 'Room#getParticipantByDialInPin', 'url' => '/api/{apiVersion}/room/{token}/pin/{pin}', 'verb' => 'GET', 'requirements' => array_merge($requirementsWithToken, [ 'pin' => '^\d{7,32}$', ])], + /** @see \OCA\Talk\Controller\RoomController::setNotificationLevel() */ ['name' => 'Room#setNotificationLevel', 'url' => '/api/{apiVersion}/room/{token}/notify', 'verb' => 'POST', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setNotificationCalls() */ ['name' => 'Room#setNotificationCalls', 'url' => '/api/{apiVersion}/room/{token}/notify-calls', 'verb' => 'POST', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setLobby() */ ['name' => 'Room#setLobby', 'url' => '/api/{apiVersion}/room/{token}/webinar/lobby', 'verb' => 'PUT', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\RoomController::setSIPEnabled() */ ['name' => 'Room#setSIPEnabled', 'url' => '/api/{apiVersion}/room/{token}/webinar/sip', 'verb' => 'PUT', 'requirements' => $requirementsWithToken], ], ]; diff --git a/appinfo/routes/routesSettingsController.php b/appinfo/routes/routesSettingsController.php index 6829ebea3..c7ced9329 100644 --- a/appinfo/routes/routesSettingsController.php +++ b/appinfo/routes/routesSettingsController.php @@ -29,7 +29,9 @@ $requirements = [ return [ 'ocs' => [ + /** @see \OCA\Talk\Controller\SettingsController::setSIPSettings() */ ['name' => 'Settings#setSIPSettings', 'url' => '/api/{apiVersion}/settings/sip', 'verb' => 'POST', 'requirements' => $requirements], + /** @see \OCA\Talk\Controller\SettingsController::setUserSetting() */ ['name' => 'Settings#setUserSetting', 'url' => '/api/{apiVersion}/settings/user', 'verb' => 'POST', 'requirements' => $requirements], ], ]; diff --git a/appinfo/routes/routesSignalingController.php b/appinfo/routes/routesSignalingController.php index 48f404867..0078c90c2 100644 --- a/appinfo/routes/routesSignalingController.php +++ b/appinfo/routes/routesSignalingController.php @@ -35,12 +35,17 @@ $requirementsWithToken = [ return [ 'ocs' => [ + /** @see \OCA\Talk\Controller\SignalingController::getSettings() */ ['name' => 'Signaling#getSettings', 'url' => '/api/{apiVersion}/signaling/settings', 'verb' => 'GET', 'requirements' => $requirements], + /** @see \OCA\Talk\Controller\SignalingController::getWelcomeMessage() */ ['name' => 'Signaling#getWelcomeMessage', 'url' => '/api/{apiVersion}/signaling/welcome/{serverId}', 'verb' => 'GET', 'requirements' => array_merge($requirements, [ 'serverId' => '^\d+$', ])], + /** @see \OCA\Talk\Controller\SignalingController::backend() */ ['name' => 'Signaling#backend', 'url' => '/api/{apiVersion}/signaling/backend', 'verb' => 'POST', 'requirements' => $requirements], + /** @see \OCA\Talk\Controller\SignalingController::signaling() */ ['name' => 'Signaling#signaling', 'url' => '/api/{apiVersion}/signaling/{token}', 'verb' => 'POST', 'requirements' => $requirementsWithToken], + /** @see \OCA\Talk\Controller\SignalingController::pullMessages() */ ['name' => 'Signaling#pullMessages', 'url' => '/api/{apiVersion}/signaling/{token}', 'verb' => 'GET', 'requirements' => $requirementsWithToken], ], ]; diff --git a/appinfo/routes/routesTempAvatarController.php b/appinfo/routes/routesTempAvatarController.php index 17e3e9694..d06d0e95b 100644 --- a/appinfo/routes/routesTempAvatarController.php +++ b/appinfo/routes/routesTempAvatarController.php @@ -25,7 +25,9 @@ declare(strict_types=1); return [ 'ocs' => [ + /** @see \OCA\Talk\Controller\TempAvatarController::postAvatar() */ ['name' => 'TempAvatar#postAvatar', 'url' => '/temp-user-avatar', 'verb' => 'POST'], + /** @see \OCA\Talk\Controller\TempAvatarController::deleteAvatar() */ ['name' => 'TempAvatar#deleteAvatar', 'url' => '/temp-user-avatar', 'verb' => 'DELETE'], ], ]; diff --git a/l10n/de.js b/l10n/de.js index 08ae78f80..ccc261681 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -974,6 +974,7 @@ OC.L10N.register( "Write message, @ to mention someone …" : "Nachricht schreiben, @ um jemanden zu erwähnen …", "Invalid path selected" : "Ungültiger Pfad ausgewählt", "Start a call" : "Einen Anruf starten", + "Skip the lobby" : "Die Lobby überspringen", "Enable the microphone" : "Das Mikrofon aktivieren", "Enable the camera" : "Die Kamera aktivieren", "Share the screen" : "Den Bildschirm teilen", @@ -1012,6 +1013,7 @@ OC.L10N.register( "Add groups" : "Gruppen hinzufügen", "Add emails" : "E-Mails hinzufügen", "Add circles" : "Kreise hinzufügen", + "Add federated users" : "Federated-Benutzer hinzufügen", "Searching …" : "Suche …", "No results" : "Keine Ergebnisse", "Search for more users" : "Nach weiteren Benutzern suchen", diff --git a/l10n/de.json b/l10n/de.json index 9bbb23392..723b77af9 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -972,6 +972,7 @@ "Write message, @ to mention someone …" : "Nachricht schreiben, @ um jemanden zu erwähnen …", "Invalid path selected" : "Ungültiger Pfad ausgewählt", "Start a call" : "Einen Anruf starten", + "Skip the lobby" : "Die Lobby überspringen", "Enable the microphone" : "Das Mikrofon aktivieren", "Enable the camera" : "Die Kamera aktivieren", "Share the screen" : "Den Bildschirm teilen", @@ -1010,6 +1011,7 @@ "Add groups" : "Gruppen hinzufügen", "Add emails" : "E-Mails hinzufügen", "Add circles" : "Kreise hinzufügen", + "Add federated users" : "Federated-Benutzer hinzufügen", "Searching …" : "Suche …", "No results" : "Keine Ergebnisse", "Search for more users" : "Nach weiteren Benutzern suchen", diff --git a/package-lock.json b/package-lock.json index 492adb6c4..61c03c7a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@nextcloud/moment": "^1.1.1", "@nextcloud/paths": "^2.1.0", "@nextcloud/router": "^2.0.0", - "@nextcloud/vue": "^5.0.0-beta.0", + "@nextcloud/vue": "^5.0.0", "@nextcloud/vue-dashboard": "^2.0.1", "attachmediastream": "^2.1.0", "color.js": "^1.2.0", @@ -2587,27 +2587,6 @@ "integrity": "sha512-kC42RQW5rZjZZsRaEjVlIQpp6aW/yxm+zZdETnrRQnUzcPwBgF4wO4makfGT63Ckd+LkgUW+geesPiPRqxFVew==", "dev": true }, - "node_modules/@nextcloud/calendar-js": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-2.0.0.tgz", - "integrity": "sha512-wGDDWjnXaMTJVxK2B31S0BAstN5759fptuddWRVZcFU2gEFXZyiv0iFgcbCOdAni+/Mz9rBbdV8h+TYWbst6Qg==", - "dependencies": { - "ical.js": "^1.4.0", - "uuid": "^8.3.2" - }, - "engines": { - "node": ">=14.0.0", - "npm": ">=7.0.0" - } - }, - "node_modules/@nextcloud/calendar-js/node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/@nextcloud/capabilities": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.0.4.tgz", @@ -2825,14 +2804,14 @@ } }, "node_modules/@nextcloud/vue": { - "version": "5.0.0-beta.0", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.0.0-beta.0.tgz", - "integrity": "sha512-WNRGzYdJrtAf/mzISFzJns8W9J8VYGbJHMD1ksfgZQ19TrTKzFgp6rhSR23hgxjTHP1w+WVaFo6EvFhaJgsorw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.0.0.tgz", + "integrity": "sha512-hqfI3n3mebi7dlLUBjyBzIJQJTVjtFrCm49KYo2lQ/qDzBzOf5hrjwEEM3tnQIiPtHU8k24CnoSNqYto9XzERg==", "dependencies": { "@nextcloud/auth": "^1.2.3", "@nextcloud/axios": "^1.3.2", "@nextcloud/browser-storage": "^0.1.1", - "@nextcloud/calendar-js": "^2.0.0", + "@nextcloud/calendar-js": "^3.0.0", "@nextcloud/capabilities": "^1.0.2", "@nextcloud/dialogs": "^3.0.0", "@nextcloud/event-bus": "^2.0.0", @@ -2854,14 +2833,14 @@ "v-tooltip": "^2.0.3", "vue": "^2.6.11", "vue-color": "^2.7.1", - "vue-material-design-icons": "^4.11.0", + "vue-material-design-icons": "^5.0.0", "vue-multiselect": "^2.1.6", "vue-visible": "^1.0.2", "vue2-datepicker": "^3.6.3" }, "engines": { - "node": ">=14.0.0", - "npm": ">=7.0.0" + "node": "^14.0.0", + "npm": "^7.0.0" } }, "node_modules/@nextcloud/vue-dashboard": { @@ -3058,6 +3037,19 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, + "node_modules/@nextcloud/vue/node_modules/@nextcloud/calendar-js": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-3.0.0.tgz", + "integrity": "sha512-Uy/etWwRmbzG1jxcfampOCEXbGMEzY1xVCBlONVrkusUmD9t02u3jWFkRJGAHvFAtLd4iM+MdTo1x3VXemBvcA==", + "engines": { + "node": ">=14.0.0", + "npm": ">=7.0.0" + }, + "peerDependencies": { + "ical.js": "^1.4.0", + "uuid": "^8.3.2" + } + }, "node_modules/@nextcloud/vue/node_modules/ansi-regex": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz", @@ -3160,10 +3152,14 @@ "webpack": "^4.0.0 || ^5.0.0" } }, - "node_modules/@nextcloud/vue/node_modules/vue-material-design-icons": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-4.13.0.tgz", - "integrity": "sha512-TwaWrvh4J49VdkV9Uzcbr/p3FBRiBthRkIrg6SUh7ogFUljdA2ySNoAYD9dTU+mJkANIn1A6MoD/PnyLONnkWg==" + "node_modules/@nextcloud/vue/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "peer": true, + "bin": { + "uuid": "dist/bin/uuid" + } }, "node_modules/@nextcloud/webpack-vue-config": { "version": "4.3.2", @@ -13778,9 +13774,10 @@ } }, "node_modules/ical.js": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ical.js/-/ical.js-1.4.0.tgz", - "integrity": "sha512-ltHZuOFNNjcyEYbzDgjemS7LWIFh2vydJeznxQHUh3dnarbxqOYsWONYteBVAq1MEOHnwXFGN2eskZReHclnrA==" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/ical.js/-/ical.js-1.5.0.tgz", + "integrity": "sha512-7ZxMkogUkkaCx810yp0ZGKvq1ZpRgJeornPttpoxe6nYZ3NLesZe1wWMXDdwTkj/b5NtXT+Y16Aakph/ao98ZQ==", + "peer": true }, "node_modules/iconv-lite": { "version": "0.4.24", @@ -28696,22 +28693,6 @@ "integrity": "sha512-kC42RQW5rZjZZsRaEjVlIQpp6aW/yxm+zZdETnrRQnUzcPwBgF4wO4makfGT63Ckd+LkgUW+geesPiPRqxFVew==", "dev": true }, - "@nextcloud/calendar-js": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-2.0.0.tgz", - "integrity": "sha512-wGDDWjnXaMTJVxK2B31S0BAstN5759fptuddWRVZcFU2gEFXZyiv0iFgcbCOdAni+/Mz9rBbdV8h+TYWbst6Qg==", - "requires": { - "ical.js": "^1.4.0", - "uuid": "^8.3.2" - }, - "dependencies": { - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } - } - }, "@nextcloud/capabilities": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@nextcloud/capabilities/-/capabilities-1.0.4.tgz", @@ -28897,14 +28878,14 @@ } }, "@nextcloud/vue": { - "version": "5.0.0-beta.0", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.0.0-beta.0.tgz", - "integrity": "sha512-WNRGzYdJrtAf/mzISFzJns8W9J8VYGbJHMD1ksfgZQ19TrTKzFgp6rhSR23hgxjTHP1w+WVaFo6EvFhaJgsorw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.0.0.tgz", + "integrity": "sha512-hqfI3n3mebi7dlLUBjyBzIJQJTVjtFrCm49KYo2lQ/qDzBzOf5hrjwEEM3tnQIiPtHU8k24CnoSNqYto9XzERg==", "requires": { "@nextcloud/auth": "^1.2.3", "@nextcloud/axios": "^1.3.2", "@nextcloud/browser-storage": "^0.1.1", - "@nextcloud/calendar-js": "^2.0.0", + "@nextcloud/calendar-js": "^3.0.0", "@nextcloud/capabilities": "^1.0.2", "@nextcloud/dialogs": "^3.0.0", "@nextcloud/event-bus": "^2.0.0", @@ -28926,12 +28907,18 @@ "v-tooltip": "^2.0.3", "vue": "^2.6.11", "vue-color": "^2.7.1", - "vue-material-design-icons": "^4.11.0", + "vue-material-design-icons": "^5.0.0", "vue-multiselect": "^2.1.6", "vue-visible": "^1.0.2", "vue2-datepicker": "^3.6.3" }, "dependencies": { + "@nextcloud/calendar-js": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-3.0.0.tgz", + "integrity": "sha512-Uy/etWwRmbzG1jxcfampOCEXbGMEzY1xVCBlONVrkusUmD9t02u3jWFkRJGAHvFAtLd4iM+MdTo1x3VXemBvcA==", + "requires": {} + }, "ansi-regex": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz", @@ -29000,10 +28987,11 @@ "schema-utils": "^3.0.0" } }, - "vue-material-design-icons": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-4.13.0.tgz", - "integrity": "sha512-TwaWrvh4J49VdkV9Uzcbr/p3FBRiBthRkIrg6SUh7ogFUljdA2ySNoAYD9dTU+mJkANIn1A6MoD/PnyLONnkWg==" + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "peer": true } } }, @@ -37874,9 +37862,10 @@ "dev": true }, "ical.js": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ical.js/-/ical.js-1.4.0.tgz", - "integrity": "sha512-ltHZuOFNNjcyEYbzDgjemS7LWIFh2vydJeznxQHUh3dnarbxqOYsWONYteBVAq1MEOHnwXFGN2eskZReHclnrA==" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/ical.js/-/ical.js-1.5.0.tgz", + "integrity": "sha512-7ZxMkogUkkaCx810yp0ZGKvq1ZpRgJeornPttpoxe6nYZ3NLesZe1wWMXDdwTkj/b5NtXT+Y16Aakph/ao98ZQ==", + "peer": true }, "iconv-lite": { "version": "0.4.24", diff --git a/package.json b/package.json index 1a4fa017f..290f47755 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@nextcloud/moment": "^1.1.1", "@nextcloud/paths": "^2.1.0", "@nextcloud/router": "^2.0.0", - "@nextcloud/vue": "^5.0.0-beta.0", + "@nextcloud/vue": "^5.0.0", "@nextcloud/vue-dashboard": "^2.0.1", "attachmediastream": "^2.1.0", "color.js": "^1.2.0", diff --git a/src/components/CallView/shared/LocalMediaControls.vue b/src/components/CallView/shared/LocalMediaControls.vue index 34f399cfc..ece072d16 100644 --- a/src/components/CallView/shared/LocalMediaControls.vue +++ b/src/components/CallView/shared/LocalMediaControls.vue @@ -245,7 +245,9 @@ import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip' import { PARTICIPANT } from '../../../constants' import SpeakingWhileMutedWarner from '../../../utils/webrtc/SpeakingWhileMutedWarner' import NetworkStrength2Alert from 'vue-material-design-icons/NetworkStrength2Alert' -import { Actions, ActionSeparator, ActionButton } from '@nextcloud/vue' +import Actions from '@nextcloud/vue/dist/Components/Actions' +import ActionSeparator from '@nextcloud/vue/dist/Components/ActionSeparator' +import ActionButton from '@nextcloud/vue/dist/Components/ActionButton' import { callAnalyzer } from '../../../utils/webrtc/index' import { CONNECTION_QUALITY } from '../../../utils/webrtc/analyzers/PeerConnectionAnalyzer' import isInCall from '../../../mixins/isInCall' diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue index 7d06175f3..76e5e89cb 100644 --- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue +++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue @@ -105,7 +105,7 @@ import Modal from '@nextcloud/vue/dist/Components/Modal' import BridgePart from './BridgePart' import Vue from 'vue' -import { Tooltip } from '@nextcloud/vue' +import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip' Vue.directive('tooltip', Tooltip) export default { diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js b/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js index 00dec1b60..25ac66820 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js +++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js @@ -122,7 +122,7 @@ describe('ParticipantPermissionsEditor.vue', () => { await wrapper.findComponent(PermissionsEditor).setData({ lobbyIgnore: true }) // Click the submit button - await wrapper.findComponent(PermissionsEditor).find({ ref: 'submit' }).trigger('click') + await wrapper.findComponent(PermissionsEditor).findComponent({ ref: 'submit' }).trigger('click') expect(testStoreConfig.modules.participantsStore.actions.setPermissions).toHaveBeenCalledWith( // The first argument is the context object @@ -144,7 +144,7 @@ describe('ParticipantPermissionsEditor.vue', () => { await wrapper.findComponent(PermissionsEditor).setData({ publishAudio: false }) // Click the submit button - await wrapper.findComponent(PermissionsEditor).find({ ref: 'submit' }).trigger('click') + await wrapper.findComponent(PermissionsEditor).findComponent({ ref: 'submit' }).trigger('click') expect(testStoreConfig.modules.participantsStore.actions.setPermissions).toHaveBeenCalledWith( // The first argument is the context object diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index 241c196c7..4e02ac3a3 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -168,8 +168,8 @@ import ConversationIcon from '../ConversationIcon' import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip' import richEditor from '@nextcloud/vue/dist/Mixins/richEditor' import userStatus from '../../mixins/userStatus' -import LocalMediaControls from '../CallView/shared/LocalMediaControls.vue' -import Cog from 'vue-material-design-icons/Cog.vue' +import LocalMediaControls from '../CallView/shared/LocalMediaControls' +import Cog from 'vue-material-design-icons/Cog' import getParticipants from '../../mixins/getParticipants' export default { |