Skip to content

Commit 3db4803

Browse files
PytalPytal
authored
Merge pull request #39603 from nextcloud/backport/37954/stable25
2 parents f561cd5 + 7632515 commit 3db4803

File tree

9 files changed

+320
-82
lines changed

9 files changed

+320
-82
lines changed

‎apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap‎

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,29 @@ exports[`CalDavSettings interactions 1`] = `
44
<div>
55
<div
66
class="settings-section settings-section--limit-width"
7-
data-v-97259c4c=""
7+
data-v-3896af2a=""
88
>
99
<h2
1010
class="settings-section__title"
11-
data-v-97259c4c=""
11+
data-v-3896af2a=""
1212
>
1313
1414
Calendar server
1515
1616
<a
1717
aria-label="External documentation for Calendar server"
1818
class="settings-section__info"
19-
data-v-97259c4c=""
19+
data-v-3896af2a=""
2020
href="https://docs.nextcloud.com/server/23/go.php?to=user-sync-calendars"
21+
rel="noreferrer nofollow"
2122
role="note"
23+
target="_blank"
2224
title="External documentation for Calendar server"
2325
>
2426
<span
2527
aria-hidden="true"
2628
class="material-design-icon help-circle-icon"
27-
data-v-97259c4c=""
29+
data-v-3896af2a=""
2830
role="img"
2931
>
3032
<svg
@@ -48,7 +50,7 @@ exports[`CalDavSettings interactions 1`] = `
4850
4951
<p
5052
class="settings-hint"
51-
data-v-97259c4c=""
53+
data-v-3896af2a=""
5254
>
5355
Also install the
5456
<a
@@ -69,22 +71,22 @@ exports[`CalDavSettings interactions 1`] = `
6971
</p>
7072
7173
<p
72-
data-v-97259c4c=""
74+
data-v-3896af2a=""
7375
>
7476
<span
7577
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
76-
data-v-97259c4c=""
77-
data-v-e7f77ef4=""
78+
data-v-3896af2a=""
79+
data-v-781f2f28=""
7880
style="--icon-size: 36px;"
7981
>
8082
<label
8183
class="checkbox-radio-switch__label"
82-
data-v-e7f77ef4=""
84+
data-v-781f2f28=""
8385
for="caldavSendInvitations"
8486
>
8587
<input
8688
class="checkbox-radio-switch__input"
87-
data-v-e7f77ef4=""
89+
data-v-781f2f28=""
8890
id="caldavSendInvitations"
8991
type="checkbox"
9092
value=""
@@ -93,7 +95,7 @@ exports[`CalDavSettings interactions 1`] = `
9395
<span
9496
aria-hidden="true"
9597
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
96-
data-v-e7f77ef4=""
98+
data-v-781f2f28=""
9799
role="img"
98100
>
99101
<svg
@@ -117,7 +119,7 @@ exports[`CalDavSettings interactions 1`] = `
117119
</span>
118120
119121
<em
120-
data-v-97259c4c=""
122+
data-v-3896af2a=""
121123
>
122124
Please make sure to properly set up
123125
<a
@@ -130,22 +132,22 @@ exports[`CalDavSettings interactions 1`] = `
130132
</p>
131133
132134
<p
133-
data-v-97259c4c=""
135+
data-v-3896af2a=""
134136
>
135137
<span
136138
class="checkbox-radio-switch checkbox checkbox-radio-switch-switch checkbox-radio-switch--checked"
137-
data-v-97259c4c=""
138-
data-v-e7f77ef4=""
139+
data-v-3896af2a=""
140+
data-v-781f2f28=""
139141
style="--icon-size: 36px;"
140142
>
141143
<label
142144
class="checkbox-radio-switch__label"
143-
data-v-e7f77ef4=""
145+
data-v-781f2f28=""
144146
for="caldavGenerateBirthdayCalendar"
145147
>
146148
<input
147149
class="checkbox-radio-switch__input"
148-
data-v-e7f77ef4=""
150+
data-v-781f2f28=""
149151
id="caldavGenerateBirthdayCalendar"
150152
type="checkbox"
151153
value=""
@@ -154,7 +156,7 @@ exports[`CalDavSettings interactions 1`] = `
154156
<span
155157
aria-hidden="true"
156158
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
157-
data-v-e7f77ef4=""
159+
data-v-781f2f28=""
158160
role="img"
159161
>
160162
<svg
@@ -178,19 +180,19 @@ exports[`CalDavSettings interactions 1`] = `
178180
</span>
179181
180182
<em
181-
data-v-97259c4c=""
183+
data-v-3896af2a=""
182184
>
183185
184186
Birthday calendars will be generated by a background job.
185187
186188
</em>
187189
188190
<br
189-
data-v-97259c4c=""
191+
data-v-3896af2a=""
190192
/>
191193
192194
<em
193-
data-v-97259c4c=""
195+
data-v-3896af2a=""
194196
>
195197
196198
Hence they will not be available immediately after enabling but will show up after some time.
@@ -199,22 +201,22 @@ exports[`CalDavSettings interactions 1`] = `
199201
</p>
200202
201203
<p
202-
data-v-97259c4c=""
204+
data-v-3896af2a=""
203205
>
204206
<span
205207
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
206-
data-v-97259c4c=""
207-
data-v-e7f77ef4=""
208+
data-v-3896af2a=""
209+
data-v-781f2f28=""
208210
style="--icon-size: 36px;"
209211
>
210212
<label
211213
class="checkbox-radio-switch__label"
212-
data-v-e7f77ef4=""
214+
data-v-781f2f28=""
213215
for="caldavSendEventReminders"
214216
>
215217
<input
216218
class="checkbox-radio-switch__input"
217-
data-v-e7f77ef4=""
219+
data-v-781f2f28=""
218220
id="caldavSendEventReminders"
219221
type="checkbox"
220222
value=""
@@ -223,7 +225,7 @@ exports[`CalDavSettings interactions 1`] = `
223225
<span
224226
aria-hidden="true"
225227
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
226-
data-v-e7f77ef4=""
228+
data-v-781f2f28=""
227229
role="img"
228230
>
229231
<svg
@@ -247,7 +249,7 @@ exports[`CalDavSettings interactions 1`] = `
247249
</span>
248250
249251
<em
250-
data-v-97259c4c=""
252+
data-v-3896af2a=""
251253
>
252254
Please make sure to properly set up
253255
<a
@@ -259,11 +261,11 @@ exports[`CalDavSettings interactions 1`] = `
259261
</em>
260262
261263
<br
262-
data-v-97259c4c=""
264+
data-v-3896af2a=""
263265
/>
264266
265267
<em
266-
data-v-97259c4c=""
268+
data-v-3896af2a=""
267269
>
268270
269271
Notifications are sent via background jobs, so these must occur often enough.
@@ -273,22 +275,22 @@ exports[`CalDavSettings interactions 1`] = `
273275
274276
<p
275277
class="indented"
276-
data-v-97259c4c=""
278+
data-v-3896af2a=""
277279
>
278280
<span
279281
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
280-
data-v-97259c4c=""
281-
data-v-e7f77ef4=""
282+
data-v-3896af2a=""
283+
data-v-781f2f28=""
282284
style="--icon-size: 36px;"
283285
>
284286
<label
285287
class="checkbox-radio-switch__label"
286-
data-v-e7f77ef4=""
288+
data-v-781f2f28=""
287289
for="caldavSendEventRemindersToSharedGroupMembers"
288290
>
289291
<input
290292
class="checkbox-radio-switch__input"
291-
data-v-e7f77ef4=""
293+
data-v-781f2f28=""
292294
id="caldavSendEventRemindersToSharedGroupMembers"
293295
type="checkbox"
294296
value=""
@@ -297,7 +299,7 @@ exports[`CalDavSettings interactions 1`] = `
297299
<span
298300
aria-hidden="true"
299301
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
300-
data-v-e7f77ef4=""
302+
data-v-781f2f28=""
301303
role="img"
302304
>
303305
<svg
@@ -321,7 +323,7 @@ exports[`CalDavSettings interactions 1`] = `
321323
</span>
322324
323325
<em
324-
data-v-97259c4c=""
326+
data-v-3896af2a=""
325327
>
326328
327329
Reminders are always sent to organizers and attendees.
@@ -331,22 +333,22 @@ exports[`CalDavSettings interactions 1`] = `
331333
332334
<p
333335
class="indented"
334-
data-v-97259c4c=""
336+
data-v-3896af2a=""
335337
>
336338
<span
337339
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
338-
data-v-97259c4c=""
339-
data-v-e7f77ef4=""
340+
data-v-3896af2a=""
341+
data-v-781f2f28=""
340342
style="--icon-size: 36px;"
341343
>
342344
<label
343345
class="checkbox-radio-switch__label"
344-
data-v-e7f77ef4=""
346+
data-v-781f2f28=""
345347
for="caldavSendEventRemindersPush"
346348
>
347349
<input
348350
class="checkbox-radio-switch__input"
349-
data-v-e7f77ef4=""
351+
data-v-781f2f28=""
350352
id="caldavSendEventRemindersPush"
351353
type="checkbox"
352354
value=""
@@ -355,7 +357,7 @@ exports[`CalDavSettings interactions 1`] = `
355357
<span
356358
aria-hidden="true"
357359
class="material-design-icon toggle-switch-icon checkbox-radio-switch__icon"
358-
data-v-e7f77ef4=""
360+
data-v-781f2f28=""
359361
role="img"
360362
>
361363
<svg

‎apps/files_sharing/src/components/SharingEntryLink.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161
class="share-link-password"
162162
:class="{ error: errors.password}"
163163
:disabled="saving"
164+
:show-trailing-button="hasUnsavedPassword"
164165
:required="config.enforcePasswordForPublicLink"
165166
:value="hasUnsavedPassword ? share.newPassword : '***************'"
166167
icon="icon-password"

‎dist/core-common.js‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎dist/core-common.js.LICENSE.txt‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,18 @@
337337

338338
/*! @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 */
339339

340+
/*! For license information please see NcActionButton.js.LICENSE.txt */
341+
342+
/*! For license information please see NcActionInput.js.LICENSE.txt */
343+
344+
/*! For license information please see NcActionLink.js.LICENSE.txt */
345+
340346
/*! For license information please see NcActionSeparator.js.LICENSE.txt */
341347

348+
/*! For license information please see NcActionText.js.LICENSE.txt */
349+
350+
/*! For license information please see NcActionTextEditable.js.LICENSE.txt */
351+
342352
/*! For license information please see NcActions.js.LICENSE.txt */
343353

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

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

362+
/*! For license information please see NcAppNavigationNew.js.LICENSE.txt */
363+
352364
/*! For license information please see NcAppNavigationSettings.js.LICENSE.txt */
353365

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

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

372+
/*! For license information please see NcAvatar.js.LICENSE.txt */
373+
360374
/*! For license information please see NcButton.js.LICENSE.txt */
361375

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

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

384+
/*! For license information please see NcDashboardWidget.js.LICENSE.txt */
385+
386+
/*! For license information please see NcDashboardWidgetItem.js.LICENSE.txt */
387+
388+
/*! For license information please see NcDatetimePicker.js.LICENSE.txt */
389+
370390
/*! For license information please see NcEmojiPicker.js.LICENSE.txt */
371391

392+
/*! For license information please see NcHeaderMenu.js.LICENSE.txt */
393+
372394
/*! For license information please see NcLoadingIcon.js.LICENSE.txt */
373395

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

398+
/*! For license information please see NcMultiselect.js.LICENSE.txt */
399+
376400
/*! For license information please see NcNoteCard.js.LICENSE.txt */
377401

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

404+
/*! For license information please see NcRichContenteditable.js.LICENSE.txt */
405+
406+
/*! For license information please see NcSelect.js.LICENSE.txt */
407+
408+
/*! For license information please see NcSelectTags.js.LICENSE.txt */
409+
380410
/*! For license information please see NcSettingsSection.js.LICENSE.txt */
381411

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

414+
/*! For license information please see NcTimezonePicker.js.LICENSE.txt */
415+
384416
/*! For license information please see index.module.js.LICENSE.txt */
385417

418+
/*! For license information please see richEditor.js.LICENSE.txt */
419+
386420
/*! Hammer.JS - v2.0.7 - 2016-04-22
387421
* http://hammerjs.github.io/
388422
*

‎dist/core-common.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/files_sharing-files_sharing_tab.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/files_sharing-files_sharing_tab.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)