sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/misskey-dev/master'

Browse Source 
Conflicts:
	package.json
	packages/client/src/components/MkButton.vue
	packages/client/src/components/ui/button.vue
	packages/client/src/pages/timeline.tutorial.vue
This commit is contained in:
こけっち
2022-09-10 21:24:53 +09:00
parent bf781707c5 a2a1636c10
commit 38ae0c4c1e
373 changed files with 3168 additions and 2416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/ui/deckold/notifications-column.vue
View File

@ -9,7 +9,7 @@
<script lang="ts" setup>
import { defineAsyncComponent } from 'vue';
import XColumn from './column.vue';
import XNotifications from '@/components/notifications.vue';
import XNotifications from '@/components/MKNotifications.vue';
import * as os from '@/os';
import { updateColumn } from './deck-store';
import { Column } from './deck-store';
@ -24,7 +24,7 @@ const emit = defineEmits<{
}>();
function func() {
os.popup(defineAsyncComponent(() => import('@/components/notification-setting-window.vue')), {
os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSettingWindow.vue')), {
includingTypes: props.column.includingTypes,
}, {
done: async (res) => {