misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into merge/2025-03-24

Browse source
This commit is contained in:
Hazelnoot 2025-04-13 13:07:24 -04:00
commit 91fb75dece
11 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/SkApprovalUser.vue
View file

@ -65,7 +65,7 @@ const emits = defineEmits<{
async function deleteAccount() {
const confirm = await os.confirm({
type: 'warning',
text: i18n.ts.deleteAccountConfirm,
text: i18n.ts.deleteThisAccountConfirm,
});
if (confirm.canceled) return;

2
packages/frontend/src/components/SkModPlayer.vue
View file

@ -1,5 +1,5 @@
<!--
SPDX-FileCopyrightText: marie and other Sharkey contributors
SPDX-FileCopyrightText: puniko and other Sharkey contributors
SPDX-License-Identifier: AGPL-3.0-only
-->

2
packages/frontend/src/pages/admin-user.vue
View file

@ -449,7 +449,7 @@ async function deleteAllFiles() {
async function deleteAccount() {
const confirm = await os.confirm({
type: 'warning',
text: i18n.ts.deleteAccountConfirm,
text: i18n.ts.deleteThisAccountConfirm,
});
if (confirm.canceled) return;

2
packages/frontend/src/pages/announcement.vue
View file

@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<Mfm :text="announcement.title"/>
</div>
<div :class="$style.content">
<Mfm :text="announcement.text"/>
<Mfm :text="announcement.text" :isBlock="true"/>
<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
<div style="margin-top: 8px; opacity: 0.7; font-size: 85%;">
{{ i18n.ts.createdAt }}: <MkTime :time="announcement.createdAt" mode="detail"/>

4
packages/frontend/src/utility/chiptune2.ts
View file

@ -1,6 +1,6 @@
/*
* SPDX-FileCopyrightText: marie and other Sharkey contributors
* SPDX-License-Identifier: AGPL-3.0-only
* SPDX-FileCopyrightText: Simon Gündling and other chiptune2.js contributors
* SPDX-License-Identifier: MIT
*/
/* eslint-disable */