laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'misskey-dev:develop' into develop

Browse Source
This commit is contained in:
老兄 2023-12-11 19:44:30 +08:00 committed by GitHub
commit 3fd6c4c4cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/src/components/MkCode.core.vue
View File

@ -54,7 +54,7 @@ watch(() => props.lang, (to) => {
return new Promise((resolve) => { return new Promise((resolve) => {
fetchLanguage(to).then(() => resolve); fetchLanguage(to).then(() => resolve);
}); });
}, { immediate: true, }); }, { immediate: true });
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

2
packages/frontend/src/components/MkEmojiPicker.vue
View File

@ -108,7 +108,7 @@ import {
UnicodeEmojiDef, UnicodeEmojiDef,
unicodeEmojiCategories as categories, unicodeEmojiCategories as categories,
getEmojiName, getEmojiName,
CustomEmojiFolderTree CustomEmojiFolderTree,
} from '@/scripts/emojilist.js'; } from '@/scripts/emojilist.js';
import MkRippleEffect from '@/components/MkRippleEffect.vue'; import MkRippleEffect from '@/components/MkRippleEffect.vue';
import * as os from '@/os.js'; import * as os from '@/os.js';

2
packages/frontend/src/components/MkFollowButton.vue
View File

@ -104,7 +104,7 @@ async function onClick() {
}); });
emit('update:user', { emit('update:user', {
...props.user, ...props.user,
withReplies: defaultStore.state.defaultWithReplies withReplies: defaultStore.state.defaultWithReplies,
}); });
hasPendingFollowRequestFromYou.value = true; hasPendingFollowRequestFromYou.value = true;