Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into mahjong

Browse source
This commit is contained in:
syuilo 2024-01-30 19:56:08 +09:00
commit ef14a56a5c
143 changed files with 1966 additions and 1207 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/pages/admin/files.vue
View file

@ -80,7 +80,7 @@ function show(file) {
async function find() {
const { canceled, result: q } = await os.inputText({
title: i18n.ts.fileIdOrUrl,
allowEmpty: false,
minLength: 1,
});
if (canceled) return;

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

@ -56,7 +56,7 @@ const renote = ref<Misskey.entities.Note | undefined>();
const visibility = ref(Misskey.noteVisibilities.includes(visibilityQuery) ? visibilityQuery : undefined);
const localOnly = ref(localOnlyQuery === '0' ? false : localOnlyQuery === '1' ? true : undefined);
const files = ref([] as Misskey.entities.DriveFile[]);
const visibleUsers = ref([] as Misskey.entities.User[]);
const visibleUsers = ref([] as Misskey.entities.UserDetailed[]);
async function init() {
let noteText = '';

2
packages/frontend/src/pages/theme-editor.vue
View file

@ -190,7 +190,7 @@ function applyThemeCode() {
async function saveAs() {
const { canceled, result: name } = await os.inputText({
title: i18n.ts.name,
allowEmpty: false,
minLength: 1,
});
if (canceled) return;

2
packages/frontend/src/pages/welcome.timeline.vue
View file

@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkMediaList :mediaList="note.files"/>
</div>
<div v-if="note.poll">
<MkPoll :note="note" :readOnly="true"/>
<MkPoll :noteId="note.id" :poll="note.poll" :readOnly="true"/>
</div>
</div>
<MkReactionsViewer ref="reactionsViewer" :note="note"/>