Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable25] Do not allow to toggle between password and text in sharing #39603

Merged
merged 3 commits into from
Aug 22, 2023
Merged

[stable25] Do not allow to toggle between password and text in sharing #39603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b64d34
chore(deps): Bump @nextcloud/vue to 7.12.1
Pytal Jul 27, 2023
4b46613
Do not allow to toggle between password and text in sharing
artonge Apr 27, 2023
7632515
chore: Update dav snapshot
Pytal Aug 15, 2023
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
88 changes: 45 additions & 43 deletions apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,29 @@ exports[`CalDavSettings interactions 1`] = `
<div>
<div
class="settings-section settings-section--limit-width"
data-v-97259c4c=""
data-v-3896af2a=""
>
<h2
class="settings-section__title"
data-v-97259c4c=""
data-v-3896af2a=""
>

Calendar server

<a
aria-label="External documentation for Calendar server"
class="settings-section__info"
data-v-97259c4c=""
data-v-3896af2a=""
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-97259c4c=""
data-v-3896af2a=""
role="img"
>
<svg
Expand All @@ -48,7 +50,7 @@ exports[`CalDavSettings interactions 1`] = `

<p
class="settings-hint"
data-v-97259c4c=""
data-v-3896af2a=""
>
Also install the
<a
Expand All @@ -69,22 +71,22 @@ exports[`CalDavSettings interactions 1`] = `
</p>

<p
data-v-97259c4c=""
data-v-3896af2a=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-97259c4c=""
data-v-e7f77ef4=""
data-v-3896af2a=""
data-v-781f2f28=""
style="--icon-size: 36px;"
>
<label
class="checkbox-radio-switch__label"
data-v-e7f77ef4=""
data-v-781f2f28=""
for="caldavSendInvitations"
>
<input
class="checkbox-radio-switch__input"
data-v-e7f77ef4=""
data-v-781f2f28=""
id="caldavSendInvitations"
type="checkbox"
value=""
Expand All @@ -93,7 +95,7 @@ exports[`CalDavSettings interactions 1`] = `
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
data-v-e7f77ef4=""
data-v-781f2f28=""
role="img"
>
<svg
Expand All @@ -117,7 +119,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>

<em
data-v-97259c4c=""
data-v-3896af2a=""
>
Please make sure to properly set up
<a
Expand All @@ -130,22 +132,22 @@ exports[`CalDavSettings interactions 1`] = `
</p>

<p
data-v-97259c4c=""
data-v-3896af2a=""
>
<span
class="checkbox-radio-switch checkbox checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-97259c4c=""
data-v-e7f77ef4=""
data-v-3896af2a=""
data-v-781f2f28=""
style="--icon-size: 36px;"
>
<label
class="checkbox-radio-switch__label"
data-v-e7f77ef4=""
data-v-781f2f28=""
for="caldavGenerateBirthdayCalendar"
>
<input
class="checkbox-radio-switch__input"
data-v-e7f77ef4=""
data-v-781f2f28=""
id="caldavGenerateBirthdayCalendar"
type="checkbox"
value=""
Expand All @@ -154,7 +156,7 @@ exports[`CalDavSettings interactions 1`] = `
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
data-v-e7f77ef4=""
data-v-781f2f28=""
role="img"
>
<svg
Expand All @@ -178,19 +180,19 @@ exports[`CalDavSettings interactions 1`] = `
</span>

<em
data-v-97259c4c=""
data-v-3896af2a=""
>

Birthday calendars will be generated by a background job.

</em>

<br
data-v-97259c4c=""
data-v-3896af2a=""
/>

<em
data-v-97259c4c=""
data-v-3896af2a=""
>

Hence they will not be available immediately after enabling but will show up after some time.
Expand All @@ -199,22 +201,22 @@ exports[`CalDavSettings interactions 1`] = `
</p>

<p
data-v-97259c4c=""
data-v-3896af2a=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-97259c4c=""
data-v-e7f77ef4=""
data-v-3896af2a=""
data-v-781f2f28=""
style="--icon-size: 36px;"
>
<label
class="checkbox-radio-switch__label"
data-v-e7f77ef4=""
data-v-781f2f28=""
for="caldavSendEventReminders"
>
<input
class="checkbox-radio-switch__input"
data-v-e7f77ef4=""
data-v-781f2f28=""
id="caldavSendEventReminders"
type="checkbox"
value=""
Expand All @@ -223,7 +225,7 @@ exports[`CalDavSettings interactions 1`] = `
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
data-v-e7f77ef4=""
data-v-781f2f28=""
role="img"
>
<svg
Expand All @@ -247,7 +249,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>

<em
data-v-97259c4c=""
data-v-3896af2a=""
>
Please make sure to properly set up
<a
Expand All @@ -259,11 +261,11 @@ exports[`CalDavSettings interactions 1`] = `
</em>

<br
data-v-97259c4c=""
data-v-3896af2a=""
/>

<em
data-v-97259c4c=""
data-v-3896af2a=""
>

Notifications are sent via background jobs, so these must occur often enough.
Expand All @@ -273,22 +275,22 @@ exports[`CalDavSettings interactions 1`] = `

<p
class="indented"
data-v-97259c4c=""
data-v-3896af2a=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-97259c4c=""
data-v-e7f77ef4=""
data-v-3896af2a=""
data-v-781f2f28=""
style="--icon-size: 36px;"
>
<label
class="checkbox-radio-switch__label"
data-v-e7f77ef4=""
data-v-781f2f28=""
for="caldavSendEventRemindersToSharedGroupMembers"
>
<input
class="checkbox-radio-switch__input"
data-v-e7f77ef4=""
data-v-781f2f28=""
id="caldavSendEventRemindersToSharedGroupMembers"
type="checkbox"
value=""
Expand All @@ -297,7 +299,7 @@ exports[`CalDavSettings interactions 1`] = `
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
data-v-e7f77ef4=""
data-v-781f2f28=""
role="img"
>
<svg
Expand All @@ -321,7 +323,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>

<em
data-v-97259c4c=""
data-v-3896af2a=""
>

Reminders are always sent to organizers and attendees.
Expand All @@ -331,22 +333,22 @@ exports[`CalDavSettings interactions 1`] = `

<p
class="indented"
data-v-97259c4c=""
data-v-3896af2a=""
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-97259c4c=""
data-v-e7f77ef4=""
data-v-3896af2a=""
data-v-781f2f28=""
style="--icon-size: 36px;"
>
<label
class="checkbox-radio-switch__label"
data-v-e7f77ef4=""
data-v-781f2f28=""
for="caldavSendEventRemindersPush"
>
<input
class="checkbox-radio-switch__input"
data-v-e7f77ef4=""
data-v-781f2f28=""
id="caldavSendEventRemindersPush"
type="checkbox"
value=""
Expand All @@ -355,7 +357,7 @@ exports[`CalDavSettings interactions 1`] = `
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
data-v-e7f77ef4=""
data-v-781f2f28=""
role="img"
>
<svg
Expand Down
1 change: 1 addition & 0 deletions apps/files_sharing/src/components/SharingEntryLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
class="share-link-password"
:class="{ error: errors.password}"
:disabled="saving"
:show-trailing-button="hasUnsavedPassword"
:required="config.enforcePasswordForPublicLink"
:value="hasUnsavedPassword ? share.newPassword : '***************'"
icon="icon-password"
Expand Down
4 changes: 2 additions & 2 deletions dist/core-common.js
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions dist/core-common.js.LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,18 @@

/*! @license DOMPurify 2.4.4 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.4/LICENSE */

/*! For license information please see NcActionButton.js.LICENSE.txt */

/*! For license information please see NcActionInput.js.LICENSE.txt */

/*! For license information please see NcActionLink.js.LICENSE.txt */

/*! For license information please see NcActionSeparator.js.LICENSE.txt */

/*! For license information please see NcActionText.js.LICENSE.txt */

/*! For license information please see NcActionTextEditable.js.LICENSE.txt */

/*! For license information please see NcActions.js.LICENSE.txt */

/*! For license information please see NcAppContent.js.LICENSE.txt */
Expand All @@ -349,6 +359,8 @@

/*! For license information please see NcAppNavigationItem.js.LICENSE.txt */

/*! For license information please see NcAppNavigationNew.js.LICENSE.txt */

/*! For license information please see NcAppNavigationSettings.js.LICENSE.txt */

/*! For license information please see NcAppNavigationSpacer.js.LICENSE.txt */
Expand All @@ -357,6 +369,8 @@

/*! For license information please see NcAppSidebarTab.js.LICENSE.txt */

/*! For license information please see NcAvatar.js.LICENSE.txt */

/*! For license information please see NcButton.js.LICENSE.txt */

/*! For license information please see NcCheckboxRadioSwitch.js.LICENSE.txt */
Expand All @@ -367,22 +381,42 @@

/*! For license information please see NcCounterBubble.js.LICENSE.txt */

/*! For license information please see NcDashboardWidget.js.LICENSE.txt */

/*! For license information please see NcDashboardWidgetItem.js.LICENSE.txt */

/*! For license information please see NcDatetimePicker.js.LICENSE.txt */

/*! For license information please see NcEmojiPicker.js.LICENSE.txt */

/*! For license information please see NcHeaderMenu.js.LICENSE.txt */

/*! For license information please see NcLoadingIcon.js.LICENSE.txt */

/*! For license information please see NcModal.js.LICENSE.txt */

/*! For license information please see NcMultiselect.js.LICENSE.txt */

/*! For license information please see NcNoteCard.js.LICENSE.txt */

/*! For license information please see NcPasswordField.js.LICENSE.txt */

/*! For license information please see NcRichContenteditable.js.LICENSE.txt */

/*! For license information please see NcSelect.js.LICENSE.txt */

/*! For license information please see NcSelectTags.js.LICENSE.txt */

/*! For license information please see NcSettingsSection.js.LICENSE.txt */

/*! For license information please see NcTextField.js.LICENSE.txt */

/*! For license information please see NcTimezonePicker.js.LICENSE.txt */

/*! For license information please see index.module.js.LICENSE.txt */

/*! For license information please see richEditor.js.LICENSE.txt */

/*! Hammer.JS - v2.0.7 - 2016-04-22
* http://hammerjs.github.io/
*
Expand Down
2 changes: 1 addition & 1 deletion dist/core-common.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading