Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -72,35 +72,35 @@ exports[`CalDavSettings > interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-22cdd229=""
data-v-6b8d4c30=""
data-v-6f6953b5=""
data-v-f275cf53=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavSendInvitations-label"
class="checkbox-radio-switch__input"
data-v-22cdd229=""
data-v-f275cf53=""
id="caldavSendInvitations"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
data-v-18de8bed=""
data-v-22cdd229=""
data-v-3714b019=""
data-v-f275cf53=""
id="caldavSendInvitations-label"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-content__icon--checked checkbox-radio-switch__icon"
data-v-18de8bed=""
data-v-3714b019=""
inert="inert"
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-18de8bed=""
data-v-3714b019=""
role="img"
>
<svg
Expand All @@ -120,7 +120,7 @@ exports[`CalDavSettings > interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-18de8bed=""
data-v-3714b019=""
>
Send invitations to attendees
</span>
Expand All @@ -145,35 +145,35 @@ exports[`CalDavSettings > interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-22cdd229=""
data-v-6b8d4c30=""
data-v-6f6953b5=""
data-v-f275cf53=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavGenerateBirthdayCalendar-label"
class="checkbox-radio-switch__input"
data-v-22cdd229=""
data-v-f275cf53=""
id="caldavGenerateBirthdayCalendar"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
data-v-18de8bed=""
data-v-22cdd229=""
data-v-3714b019=""
data-v-f275cf53=""
id="caldavGenerateBirthdayCalendar-label"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-content__icon--checked checkbox-radio-switch__icon"
data-v-18de8bed=""
data-v-3714b019=""
inert="inert"
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-18de8bed=""
data-v-3714b019=""
role="img"
>
<svg
Expand All @@ -193,7 +193,7 @@ exports[`CalDavSettings > interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-18de8bed=""
data-v-3714b019=""
>
Automatically generate a birthday calendar
</span>
Expand Down Expand Up @@ -222,35 +222,35 @@ exports[`CalDavSettings > interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-22cdd229=""
data-v-6b8d4c30=""
data-v-6f6953b5=""
data-v-f275cf53=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavSendEventReminders-label"
class="checkbox-radio-switch__input"
data-v-22cdd229=""
data-v-f275cf53=""
id="caldavSendEventReminders"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
data-v-18de8bed=""
data-v-22cdd229=""
data-v-3714b019=""
data-v-f275cf53=""
id="caldavSendEventReminders-label"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-content__icon--checked checkbox-radio-switch__icon"
data-v-18de8bed=""
data-v-3714b019=""
inert="inert"
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-18de8bed=""
data-v-3714b019=""
role="img"
>
<svg
Expand All @@ -270,7 +270,7 @@ exports[`CalDavSettings > interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-18de8bed=""
data-v-3714b019=""
>
Send notifications for events
</span>
Expand Down Expand Up @@ -306,35 +306,35 @@ exports[`CalDavSettings > interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-22cdd229=""
data-v-6b8d4c30=""
data-v-6f6953b5=""
data-v-f275cf53=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavSendEventRemindersToSharedGroupMembers-label"
class="checkbox-radio-switch__input"
data-v-22cdd229=""
data-v-f275cf53=""
id="caldavSendEventRemindersToSharedGroupMembers"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
data-v-18de8bed=""
data-v-22cdd229=""
data-v-3714b019=""
data-v-f275cf53=""
id="caldavSendEventRemindersToSharedGroupMembers-label"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-content__icon--checked checkbox-radio-switch__icon"
data-v-18de8bed=""
data-v-3714b019=""
inert="inert"
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-18de8bed=""
data-v-3714b019=""
role="img"
>
<svg
Expand All @@ -354,7 +354,7 @@ exports[`CalDavSettings > interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-18de8bed=""
data-v-3714b019=""
>
Send reminder notifications to calendar sharees as well
</span>
Expand All @@ -374,35 +374,35 @@ exports[`CalDavSettings > interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-22cdd229=""
data-v-6b8d4c30=""
data-v-6f6953b5=""
data-v-f275cf53=""
style="--icon-size: 36px; --icon-height: 16px;"
>
<input
aria-labelledby="caldavSendEventRemindersPush-label"
class="checkbox-radio-switch__input"
data-v-22cdd229=""
data-v-f275cf53=""
id="caldavSendEventRemindersPush"
type="checkbox"
value=""
/>
<span
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
data-v-18de8bed=""
data-v-22cdd229=""
data-v-3714b019=""
data-v-f275cf53=""
id="caldavSendEventRemindersPush-label"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-content__icon--checked checkbox-radio-switch__icon"
data-v-18de8bed=""
data-v-3714b019=""
inert="inert"
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-18de8bed=""
data-v-3714b019=""
role="img"
>
<svg
Expand All @@ -422,7 +422,7 @@ exports[`CalDavSettings > interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-18de8bed=""
data-v-3714b019=""
>
Enable notifications for events via push
</span>
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/services/HotKeysService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { dirname } from 'path'
import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
import { useHotKey } from '@nextcloud/vue/composables/useHotKey'

import { action as deleteAction } from '../actions/deleteAction.ts'
import { action as favoriteAction } from '../actions/favoriteAction.ts'
Expand Down
1 change: 1 addition & 0 deletions apps/systemtags/src/services/HotKeysService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const registerHotkeys = function() {
useHotKey('t', () => executeAction(manageTagAction), {
stop: true,
prevent: true,
window,
})

logger.debug('Hotkeys registered')
Expand Down
31 changes: 15 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
"@nextcloud/event-bus": "^3.3.2",
"@nextcloud/files": "^3.10.2",
"@nextcloud/initial-state": "^2.2.0",
"@nextcloud/l10n": "^3.3.0",
"@nextcloud/l10n": "^3.4.0",
"@nextcloud/logger": "^3.0.2",
"@nextcloud/moment": "^1.3.4",
"@nextcloud/moment": "^1.3.5",
"@nextcloud/password-confirmation": "^5.3.1",
"@nextcloud/paths": "^2.2.1",
"@nextcloud/router": "^3.0.1",
"@nextcloud/sharing": "^0.2.4",
"@nextcloud/upload": "^1.10.0",
"@nextcloud/vue": "^8.27.0",
"@nextcloud/vue": "^8.28.0",
"@simplewebauthn/browser": "^12.0.0",
"@vue/web-component-wrapper": "^1.3.0",
"@vueuse/components": "^11.3.0",
Expand Down
4 changes: 4 additions & 0 deletions vitest.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ export default defineConfig({
plugins: [vue()],
test: {
include: ['{apps,core}/**/*.{test,spec}.?(c|m)[jt]s?(x)'],
env: {
LANG: 'en-US',
TZ: 'UTC',
},
environment: 'jsdom',
environmentOptions: {
jsdom: {
Expand Down
Loading