Merge upstream

This commit is contained in:
무라쿠모 2024-08-12 18:37:03 +09:00
commit b546ab3252
No known key found for this signature in database
GPG key ID: 139D6573F92DA9F7
17 changed files with 2802 additions and 3710 deletions

View file

@ -46,7 +46,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #key>{{ i18n.ts.email }}</template>
<template #value><span class="_monospace">{{ info.email }}</span></template>
</MkKeyValue>
<MkKeyValue v-if="iAmAdmin && ips ? ips.length : 0 > 0" :copy="ips ? ips[0].ip : null" oneline>
<MkKeyValue v-if="iAmAdmin && ips && ips.length > 0" :copy="ips[0].ip" oneline>
<template #key>IP (recent)</template>
<template #value><span class="_monospace">{{ ips ? ips[0].ip : 'N/A' }}</span></template>
</MkKeyValue>