sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into pag-back

Browse Source
This commit is contained in:
Kagami Sascha Rosylight
2023-07-12 22:29:49 +02:00
committed by GitHub
parent f5a019a6d6 cd9affd568
commit 794ff58b07
47 changed files with 304 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/.storybook/preload-locale.ts
View File

@@ -1,5 +1,5 @@
import { writeFile } from 'node:fs/promises';
import * as locales from '../../../locales/index.js';
import locales from '../../../locales/index.js';
await writeFile(
new URL('locale.ts', import.meta.url),

4
packages/frontend/src/pages/custom-emojis-manager.vue
View File

@@ -18,7 +18,7 @@
<MkButton inline @click="setTagBulk">Set tag</MkButton>
<MkButton inline @click="addTagBulk">Add tag</MkButton>
<MkButton inline @click="removeTagBulk">Remove tag</MkButton>
<MkButton inline @click="setLisenceBulk">Set Lisence</MkButton>
<MkButton inline @click="setLicenseBulk">Set License</MkButton>
<MkButton inline danger @click="delBulk">Delete</MkButton>
</div>
<MkPagination ref="emojisPaginationComponent" :pagination="pagination">
@@ -221,7 +221,7 @@ const setCategoryBulk = async () => {
emojisPaginationComponent.value.reload();
};
const setLisenceBulk = async () => {
const setLicenseBulk = async () => {
const { canceled, result } = await os.inputText({
title: 'License',
});