aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorPytal <24800714+Pytal@users.noreply.github.com>2023-10-06 15:32:38 -0700
committerGitHub <noreply@github.com>2023-10-06 15:32:38 -0700
commit597965145c944ba494fe91b0b08e78585099fc21 (patch)
tree30d37873356ac07d1f128eedc1b1df4a11e96343 /apps
parent71cd97c37f9879c3c8ee06e8a56f8995b0195f45 (diff)
parentca43254b931502153cb506649354c47c7793111f (diff)
downloadnextcloud-server-597965145c944ba494fe91b0b08e78585099fc21.tar.gz
nextcloud-server-597965145c944ba494fe91b0b08e78585099fc21.zip
Merge pull request #40692 from nextcloud/deps/nextcloud/vue-8.0.0-beta.7
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap124
-rw-r--r--apps/files_sharing/src/views/SharingDetailsTab.vue4
2 files changed, 56 insertions, 72 deletions
diff --git a/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap b/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
index 62363797529..cc539382744 100644
--- a/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
+++ b/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
@@ -4,29 +4,25 @@ exports[`CalDavSettings interactions 1`] = `
<div>
<div
class="settings-section settings-section--limit-width"
- data-v-7c88e201=""
+ data-v-375ea653=""
>
<h2
class="settings-section__name"
- data-v-7c88e201=""
+ data-v-375ea653=""
>
-
- Calendar server
-
+ Calendar server
<a
- aria-label="External documentation for Calendar server"
class="settings-section__info"
- data-v-7c88e201=""
+ data-v-375ea653=""
href="https://docs.nextcloud.com/server/23/go.php?to=user-sync-calendars"
rel="noreferrer nofollow"
- role="note"
target="_blank"
title="External documentation for Calendar server"
>
<span
aria-hidden="true"
class="material-design-icon help-circle-icon"
- data-v-7c88e201=""
+ data-v-375ea653=""
role="img"
>
<svg
@@ -45,12 +41,10 @@ exports[`CalDavSettings interactions 1`] = `
</span>
</a>
</h2>
-
<!---->
-
<p
class="settings-hint"
- data-v-7c88e201=""
+ data-v-375ea653=""
>
Also install the
<a
@@ -71,35 +65,34 @@ exports[`CalDavSettings interactions 1`] = `
</p>
<p
- data-v-7c88e201=""
+ data-v-375ea653=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-51081647=""
- data-v-7c88e201=""
+ data-v-375ea653=""
+ data-v-a6f82e18=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
- data-v-51081647=""
+ data-v-a6f82e18=""
id="caldavSendInvitations"
type="checkbox"
value=""
/>
-
<label
class="checkbox-radio-switch__label"
- data-v-51081647=""
+ data-v-a6f82e18=""
for="caldavSendInvitations"
>
<div
class="checkbox-radio-switch__icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
role="img"
>
<svg
@@ -117,10 +110,9 @@ exports[`CalDavSettings interactions 1`] = `
</svg>
</span>
</div>
-
<span
class="checkbox-radio-switch__label-text"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
Send invitations to attendees
@@ -130,7 +122,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>
<em
- data-v-7c88e201=""
+ data-v-375ea653=""
>
Please make sure to properly set up
<a
@@ -143,35 +135,34 @@ exports[`CalDavSettings interactions 1`] = `
</p>
<p
- data-v-7c88e201=""
+ data-v-375ea653=""
>
<span
class="checkbox-radio-switch checkbox checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-51081647=""
- data-v-7c88e201=""
+ data-v-375ea653=""
+ data-v-a6f82e18=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
- data-v-51081647=""
+ data-v-a6f82e18=""
id="caldavGenerateBirthdayCalendar"
type="checkbox"
value=""
/>
-
<label
class="checkbox-radio-switch__label"
- data-v-51081647=""
+ data-v-a6f82e18=""
for="caldavGenerateBirthdayCalendar"
>
<div
class="checkbox-radio-switch__icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
role="img"
>
<svg
@@ -189,10 +180,9 @@ exports[`CalDavSettings interactions 1`] = `
</svg>
</span>
</div>
-
<span
class="checkbox-radio-switch__label-text"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
Automatically generate a birthday calendar
@@ -202,7 +192,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>
<em
- data-v-7c88e201=""
+ data-v-375ea653=""
>
Birthday calendars will be generated by a background job.
@@ -210,11 +200,11 @@ exports[`CalDavSettings interactions 1`] = `
</em>
<br
- data-v-7c88e201=""
+ data-v-375ea653=""
/>
<em
- data-v-7c88e201=""
+ data-v-375ea653=""
>
Hence they will not be available immediately after enabling but will show up after some time.
@@ -223,35 +213,34 @@ exports[`CalDavSettings interactions 1`] = `
</p>
<p
- data-v-7c88e201=""
+ data-v-375ea653=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-51081647=""
- data-v-7c88e201=""
+ data-v-375ea653=""
+ data-v-a6f82e18=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
- data-v-51081647=""
+ data-v-a6f82e18=""
id="caldavSendEventReminders"
type="checkbox"
value=""
/>
-
<label
class="checkbox-radio-switch__label"
- data-v-51081647=""
+ data-v-a6f82e18=""
for="caldavSendEventReminders"
>
<div
class="checkbox-radio-switch__icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
role="img"
>
<svg
@@ -269,10 +258,9 @@ exports[`CalDavSettings interactions 1`] = `
</svg>
</span>
</div>
-
<span
class="checkbox-radio-switch__label-text"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
Send notifications for events
@@ -282,7 +270,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>
<em
- data-v-7c88e201=""
+ data-v-375ea653=""
>
Please make sure to properly set up
<a
@@ -294,11 +282,11 @@ exports[`CalDavSettings interactions 1`] = `
</em>
<br
- data-v-7c88e201=""
+ data-v-375ea653=""
/>
<em
- data-v-7c88e201=""
+ data-v-375ea653=""
>
Notifications are sent via background jobs, so these must occur often enough.
@@ -308,35 +296,34 @@ exports[`CalDavSettings interactions 1`] = `
<p
class="indented"
- data-v-7c88e201=""
+ data-v-375ea653=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-51081647=""
- data-v-7c88e201=""
+ data-v-375ea653=""
+ data-v-a6f82e18=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
- data-v-51081647=""
+ data-v-a6f82e18=""
id="caldavSendEventRemindersToSharedGroupMembers"
type="checkbox"
value=""
/>
-
<label
class="checkbox-radio-switch__label"
- data-v-51081647=""
+ data-v-a6f82e18=""
for="caldavSendEventRemindersToSharedGroupMembers"
>
<div
class="checkbox-radio-switch__icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
role="img"
>
<svg
@@ -354,10 +341,9 @@ exports[`CalDavSettings interactions 1`] = `
</svg>
</span>
</div>
-
<span
class="checkbox-radio-switch__label-text"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
Send reminder notifications to calendar sharees as well
@@ -367,7 +353,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>
<em
- data-v-7c88e201=""
+ data-v-375ea653=""
>
Reminders are always sent to organizers and attendees.
@@ -377,35 +363,34 @@ exports[`CalDavSettings interactions 1`] = `
<p
class="indented"
- data-v-7c88e201=""
+ data-v-375ea653=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
- data-v-51081647=""
- data-v-7c88e201=""
+ data-v-375ea653=""
+ data-v-a6f82e18=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
- data-v-51081647=""
+ data-v-a6f82e18=""
id="caldavSendEventRemindersPush"
type="checkbox"
value=""
/>
-
<label
class="checkbox-radio-switch__label"
- data-v-51081647=""
+ data-v-a6f82e18=""
for="caldavSendEventRemindersPush"
>
<div
class="checkbox-radio-switch__icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
- data-v-51081647=""
+ data-v-a6f82e18=""
role="img"
>
<svg
@@ -423,10 +408,9 @@ exports[`CalDavSettings interactions 1`] = `
</svg>
</span>
</div>
-
<span
class="checkbox-radio-switch__label-text"
- data-v-51081647=""
+ data-v-a6f82e18=""
>
Enable notifications for events via push
diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue
index e8c073f8bca..c3edf13c32f 100644
--- a/apps/files_sharing/src/views/SharingDetailsTab.vue
+++ b/apps/files_sharing/src/views/SharingDetailsTab.vue
@@ -210,7 +210,7 @@
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcInputField from '@nextcloud/vue/dist/Components/NcInputField.js'
import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
-import NcDatetimePicker from '@nextcloud/vue/dist/Components/NcDatetimePicker.js'
+import NcDateTimePicker from '@nextcloud/vue/dist/Components/NcDateTimePicker.js'
import NcDateTimePickerNative from '@nextcloud/vue/dist/Components/NcDateTimePickerNative.js'
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
@@ -245,7 +245,7 @@ export default {
NcAvatar,
NcButton,
NcInputField,
- NcDatetimePicker,
+ NcDateTimePicker,
NcDateTimePickerNative,
NcCheckboxRadioSwitch,
NcLoadingIcon,