Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion apps/dav/src/components/AbsenceForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<label for="replacement-search-input">{{ t('dav', 'Out of office replacement (optional)') }}</label>
<NcSelectUsers
v-model="replacementUser"
input-id="replacement-search-input"
inputId="replacement-search-input"
:loading="searchLoading"
:placeholder="t('dav', 'Name of the replacement')"
:options="options"
Expand Down
28 changes: 14 additions & 14 deletions apps/dav/src/components/AvailabilityForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,20 @@ async function save() {
<CalendarAvailability
v-model:slots="slots"
:loading="loading"
:l10n-to="t('dav', 'to')"
:l10n-delete-slot="t('dav', 'Delete slot')"
:l10n-empty-day="t('dav', 'No working hours set')"
:l10n-add-slot="t('dav', 'Add slot')"
:l10n-week-day-list-label="t('dav', 'Weekdays')"
:l10n-monday="t('dav', 'Monday')"
:l10n-tuesday="t('dav', 'Tuesday')"
:l10n-wednesday="t('dav', 'Wednesday')"
:l10n-thursday="t('dav', 'Thursday')"
:l10n-friday="t('dav', 'Friday')"
:l10n-saturday="t('dav', 'Saturday')"
:l10n-sunday="t('dav', 'Sunday')"
:l10n-start-picker-label="(dayName) => t('dav', 'Pick a start time for {dayName}', { dayName })"
:l10n-end-picker-label="(dayName) => t('dav', 'Pick a end time for {dayName}', { dayName })" />
:l10nTo="t('dav', 'to')"
:l10nDeleteSlot="t('dav', 'Delete slot')"
:l10nEmptyDay="t('dav', 'No working hours set')"
:l10nAddSlot="t('dav', 'Add slot')"
:l10nWeekDayListLabel="t('dav', 'Weekdays')"
:l10nMonday="t('dav', 'Monday')"
:l10nTuesday="t('dav', 'Tuesday')"
:l10nWednesday="t('dav', 'Wednesday')"
:l10nThursday="t('dav', 'Thursday')"
:l10nFriday="t('dav', 'Friday')"
:l10nSaturday="t('dav', 'Saturday')"
:l10nSunday="t('dav', 'Sunday')"
:l10nStartPickerLabel="(dayName) => t('dav', 'Pick a start time for {dayName}', { dayName })"
:l10nEndPickerLabel="(dayName) => t('dav', 'Pick a end time for {dayName}', { dayName })" />

<NcCheckboxRadioSwitch v-model="automated">
{{ t('dav', 'Automatically set user status to "Do not disturb" outside of availability to mute all notifications.') }}
Expand Down
4 changes: 2 additions & 2 deletions apps/dav/src/components/ExampleContactSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<template>
<div class="example-contact-settings">
<NcCheckboxRadioSwitch
:model-value="enableDefaultContact"
:modelValue="enableDefaultContact"
type="switch"
@update:model-value="updateEnableDefaultContact">
@update:modelValue="updateEnableDefaultContact">
{{ t('dav', "Add example contact to user's address book when they first log in") }}
</NcCheckboxRadioSwitch>
<div v-if="enableDefaultContact" class="example-contact-settings__buttons">
Expand Down
4 changes: 2 additions & 2 deletions apps/dav/src/components/ExampleEventSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<template>
<div class="example-event-settings">
<NcCheckboxRadioSwitch
:model-value="createExampleEvent"
:modelValue="createExampleEvent"
:disabled="savingConfig"
type="switch"
@update:model-value="updateCreateExampleEvent">
@update:modelValue="updateCreateExampleEvent">
{{ t('dav', "Add example event to user's calendar when they first log in") }}
</NcCheckboxRadioSwitch>
<div
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/src/views/CalDavSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<template>
<NcSettingsSection
:name="t('dav', 'Calendar server')"
:doc-url="userSyncCalendarsDocUrl">
:docUrl="userSyncCalendarsDocUrl">
<!-- Can use v-html as:
- t passes the translated string through DOMPurify.sanitize,
- replacement strings are not user-controlled. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ async function onSubmit() {
required
name="confirmPassword"
:error="!!confirmPassword && !passwordMatch"
:helper-text="(passwordMatch || !confirmPassword) ? '' : t('encryption', 'Passwords fields do not match')"
:helperText="(passwordMatch || !confirmPassword) ? '' : t('encryption', 'Passwords fields do not match')"
:label="t('encryption', 'Repeat recovery key password')" />

<NcButton type="submit" :variant="recoveryEnabled ? 'error' : 'primary'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async function onSubmit() {
required
name="confirmPassword"
:error="!passwordMatch && !!confirmPassword"
:helper-text="(passwordMatch || !confirmPassword) ? '' : t('encryption', 'Passwords fields do not match')"
:helperText="(passwordMatch || !confirmPassword) ? '' : t('encryption', 'Passwords fields do not match')"
:label="t('encryption', 'Repeat new recovery key password')" />

<NcButton type="submit" variant="primary">
Expand Down
2 changes: 1 addition & 1 deletion apps/encryption/src/views/SettingsPersonal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ async function reloadStatus() {

<SettingsPersonalChangePrivateKey
v-else-if="initialized === InitStatus.InitExecuted"
:recovery-enabled-for-user
:recoveryEnabledForUser
@updated="reloadStatus" />
<SettingsPersonalEnableRecovery
v-else-if="personalSettings.recoveryEnabled && personalSettings.privateKeySet"
Expand Down
10 changes: 5 additions & 5 deletions apps/federatedfilesharing/src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ async function updateAppConfig(key: string, value: boolean) {
<NcSettingsSection
:name="t('federatedfilesharing', 'Federated Cloud Sharing')"
:description="t('federatedfilesharing', 'Adjust how people can share between servers. This includes shares between people on this server as well if they are using federated sharing.')"
:doc-url="sharingFederatedDocUrl">
:docUrl="sharingFederatedDocUrl">
<NcCheckboxRadioSwitch
v-model="state.outgoingServer2serverShareEnabled"
type="switch">
Expand Down Expand Up @@ -188,17 +188,17 @@ async function updateAppConfig(key: string, value: boolean) {

<NcCheckboxRadioSwitch
type="switch"
:model-value="state.lookupServerEnabled"
:modelValue="state.lookupServerEnabled"
disabled
@update:model-value="showLookupServerConfirmation">
@update:modelValue="showLookupServerConfirmation">
{{ t('federatedfilesharing', 'Search global and public address book for people') }}
</NcCheckboxRadioSwitch>

<NcCheckboxRadioSwitch
type="switch"
:model-value="state.lookupServerUploadEnabled"
:modelValue="state.lookupServerUploadEnabled"
disabled
@update:model-value="showLookupServerUploadConfirmation">
@update:modelValue="showLookupServerUploadConfirmation">
{{ t('federatedfilesharing', 'Allow people to publish their data to a global and public address book') }}
</NcCheckboxRadioSwitch>
</fieldset>
Expand Down
12 changes: 6 additions & 6 deletions apps/federatedfilesharing/src/components/PersonalSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,18 @@ async function copyCloudId(): Promise<void> {
<NcSettingsSection
:name="t('federatedfilesharing', 'Federated Cloud')"
:description="t('federatedfilesharing', 'You can share with anyone who uses a {productName} server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com', { productName })"
:doc-url="docUrlFederated">
:docUrl="docUrlFederated">
<NcInputField
class="federated-cloud__cloud-id"
readonly
:label="t('federatedfilesharing', 'Your Federated Cloud ID')"
:model-value="cloudId"
:modelValue="cloudId"
:success="isCopied"
show-trailing-button
:trailing-button-label="copyLinkTooltip"
@trailing-button-click="copyCloudId">
showTrailingButton
:trailingButtonLabel="copyLinkTooltip"
@trailingButtonClick="copyCloudId">
<template #trailing-button-icon>
<IconCheck v-if="isCopied" :size="20" fill-color="var(--color-border-success)" />
<IconCheck v-if="isCopied" :size="20" fillColor="var(--color-border-success)" />
<IconClipboard v-else :size="20" />
</template>
</NcInputField>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const buttons = computed<INcDialogButtons>(() => [
<template>
<NcDialog
:buttons="buttons"
:is-form="passwordRequired"
:isForm="passwordRequired"
:name="t('federatedfilesharing', 'Remote share')"
@submit="emit('close', true, password)">
<p>
Expand Down
10 changes: 5 additions & 5 deletions apps/federation/src/views/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function onDelete(server: ITrustedServer) {
<template>
<NcSettingsSection
:name="t('federation', 'Trusted servers')"
:doc-url="adminSettings.docUrl"
:docUrl="adminSettings.docUrl"
:description="t('federation', 'Federation allows you to connect with other trusted servers to exchange the account directory. For example this will be used to auto-complete external accounts for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share.')">
<NcNoteCard
v-if="showPendingServerInfo"
Expand All @@ -52,10 +52,10 @@ function onDelete(server: ITrustedServer) {
:class="$style.federationAdminSettings__trustedServersList"
:aria-label="t('federation', 'Trusted servers')"
tag="ul"
:enter-from-class="$style.transition_hidden"
:enter-active-class="$style.transition_active"
:leave-active-class="$style.transition_active"
:leave-to-class="$style.transition_hidden">
:enterFromClass="$style.transition_hidden"
:enterActiveClass="$style.transition_active"
:leaveActiveClass="$style.transition_active"
:leaveToClass="$style.transition_hidden">
<TrustedServer
v-for="server in trustedServers"
:key="server.id"
Expand Down
7 changes: 6 additions & 1 deletion apps/files/src/components/VirtualList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,12 @@ export default defineComponent({
this.$nextTick(() => {
this.$el.scrollTop = scrollTop
logger.debug(`VirtualList: scrolling to index ${index}`, {
clampedIndex, scrollTop, columnCount: this.columnCount, total: this.totalRowCount, visibleRows: this.visibleRows, beforeHeight: this.beforeHeight,
clampedIndex,
scrollTop,
columnCount: this.columnCount,
total: this.totalRowCount,
visibleRows: this.visibleRows,
beforeHeight: this.beforeHeight,
})
})
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ watch(authMechanisms, () => {
<template>
<NcDialog
v-model:open="open"
is-form
:content-classes="$style.externalStorageDialog"
isForm
:contentClasses="$style.externalStorageDialog"
:name="internalStorage.id ? t('files_external', 'Edit storage') : t('files_external', 'Add storage')"
@submit="$emit('close', internalStorage)"
@update:open="$event || $emit('close')">
Expand All @@ -99,15 +99,15 @@ watch(authMechanisms, () => {
v-model="backend"
:options="backends"
:disabled="!!(internalStorage.id && internalStorage.backend)"
:input-label="t('files_external', 'External storage')"
:inputLabel="t('files_external', 'External storage')"
label="name"
required />

<NcSelect
v-model="authMechanism"
:options="authMechanisms"
:disabled="!internalStorage.backend || authMechanisms.length <= 1 || !!(internalStorage.id && internalStorage.authMechanism)"
:input-label="t('files_external', 'Authentication')"
:inputLabel="t('files_external', 'Authentication')"
label="name"
required />

Expand All @@ -121,7 +121,7 @@ watch(authMechanisms, () => {
v-if="authMechanism"
v-model="internalStorage.backendOptions"
:class="$style.externalStorageDialog__configuration"
:auth-mechanism="authMechanism" />
:authMechanism="authMechanism" />

<template #actions>
<NcButton v-if="storage.id" @click="$emit('close')">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ async function onSearch(pattern: string) {
<template>
<NcSelectUsers
v-model="model"
keep-open
keepOpen
multiple
:options="entities"
:input-label="t('files_external', 'Restrict to')"
:inputLabel="t('files_external', 'Restrict to')"
@search="debouncedSearch" />
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ watch(() => props.configuration, () => {
v-show="!(configOption.flags & ConfigurationFlag.Hidden)"
:key="configOption.value"
v-model="modelValue[configKey]!"
:config-key="configKey"
:config-option="configOption" />
:configKey="configKey"
:configOption="configOption" />
</fieldset>
</template>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const checkFilesystem = computed({
:aria-labelledby="idButton">
<NcSelect
v-model="checkFilesystem"
:input-label="t('files_external', 'Check filesystem changes')"
:inputLabel="t('files_external', 'Check filesystem changes')"
:options="checkFilesystemOptions" />

<NcCheckboxRadioSwitch v-model="modelValue.readonly" type="switch">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const storages = computed(() => {
<ExternalStorageTableRow
v-for="storage in storages"
:key="storage.id"
:is-admin
:isAdmin
:storage="storage" />
</tbody>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ async function reloadStatus() {
<NcChip
v-for="group of storage.applicableGroups"
:key="group"
:icon-path="mdiAccountGroupOutline"
no-close
:iconPath="mdiAccountGroupOutline"
noClose
:text="group" />
<NcUserBubble
v-for="user of users"
:key="user.user"
:display-name="user.displayName"
:displayName="user.displayName"
:size="24"
:user="user.user" />
</div>
Expand Down
6 changes: 3 additions & 3 deletions apps/files_external/src/views/AuthMechanismRsa.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ async function generateKeys() {
v-show="!(configOption.flags & ConfigurationFlag.Hidden)"
:key="configOption.value"
v-model="modelValue[configKey]!"
:config-key="configKey"
:config-option="configOption" />
:configKey="configKey"
:configOption="configOption" />

<NcSelect
v-model="keySize"
:clearable="false"
:input-label="t('files_external', 'Key size')"
:inputLabel="t('files_external', 'Key size')"
:options="[1024, 2048, 4096]"
required />

Expand Down
6 changes: 3 additions & 3 deletions apps/files_external/src/views/CredentialsDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ const dialogButtons: InstanceType<typeof NcDialog>['buttons'] = [{
<NcDialog
:buttons="dialogButtons"
class="external-storage-auth"
close-on-click-outside
closeOnClickOutside
data-cy-external-storage-auth
is-form
isForm
:name="t('files_external', 'Storage credentials')"
out-transition
outTransition
@submit="$emit('close', { login, password })"
@update:open="$emit('close')">
<!-- Header -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ async function addStorage(storage?: Partial<IStorage>) {

<template>
<NcSettingsSection
:doc-url="settings.docUrl"
:docUrl="settings.docUrl"
:name="t('files_external', 'External storage')"
:description="
t('files_external', 'External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices.')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ function onInput(): void {
<NcDialog
v-if="opened"
:name="t('files_reminders', `Set reminder for '{fileName}'`, { fileName: node.displayname })"
out-transition
outTransition
size="small"
close-on-click-outside
closeOnClickOutside
@closing="onClose">
<form
id="set-custom-reminder-form"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,7 @@ export default defineComponent({
value: this.emails,
key: 'emails',
scope: 'shareWith',
},
{
}, {
value: true,
key: 'enabled',
scope: 'fileRequest',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ export default defineComponent({

setup() {
return {
n, t,
n,
t,
}
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

<script lang="ts" setup>
import {
type Component, type PropType,
type Component,
type PropType,

computed,
} from 'vue'
Expand Down
Loading
Loading