1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-14 22:45:40 +02:00

Merge branch 'develop' into vue3

This commit is contained in:
syuilo
2020-07-30 10:34:39 +09:00
101 changed files with 1671 additions and 370 deletions

View File

@@ -46,7 +46,7 @@ export default defineComponent({
created() {
this.menu = [{
icon: faCog,
text: this.$t('list'),
text: this.$t('selectList'),
action: this.setList
}];
},
@@ -61,7 +61,7 @@ export default defineComponent({
async setList() {
const lists = await this.$root.api('users/lists/list');
const { canceled, result: list } = await this.$root.dialog({
title: this.$t('list'),
title: this.$t('selectList'),
type: null,
select: {
items: lists.map(x => ({