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

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkFoldableSection.vue
#	packages/frontend/src/components/MkPostForm.vue
This commit is contained in:
mattyatea 2024-02-03 21:13:22 +09:00
commit 7579df2da0
48 changed files with 607 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/pages/user/index.vue
View file

@ -96,7 +96,7 @@ const headerTabs = computed(() => user.value ? [{
key: 'achievements',
title: i18n.ts.achievements,
icon: 'ti ti-medal',
}] : []), ...($i && ($i.id === user.value.id)) || user.value.publicReactions ? [{
}] : []), ...($i && ($i.id === user.value.id || $i.isAdmin || $i.isModerator)) || user.value.publicReactions ? [{
key: 'reactions',
title: i18n.ts.reaction,
icon: 'ti ti-mood-happy',