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

Merge remote-tracking branch 'misskey/release/2024.5.0' into future-2024-04-25-post

Browse source
This commit is contained in:
dakkar 2024-05-11 14:13:07 +01:00
commit 451b0ecc9b
81 changed files with 16594 additions and 13171 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/frontend/src/ui/_common_/common.ts
View file

@ -79,7 +79,12 @@ export function openInstanceMenu(ev: MouseEvent) {
text: i18n.ts.tools,
icon: 'ph-toolbox ph-bold ph-lg',
children: toolsMenuItems(),
}, { type: 'divider' }, (instance.impressumUrl) ? {
}, { type: 'divider' }, {
type: 'link',
text: i18n.ts.inquiry,
icon: 'ph-question ph-bold ph-lg',
to: '/contact',
}, (instance.impressumUrl) ? {
text: i18n.ts.impressum,
icon: 'ph-newspaper-clipping ph-bold ph-lg',
action: () => {
@ -104,8 +109,8 @@ export function openInstanceMenu(ev: MouseEvent) {
window.open(instance.donationUrl, '_blank', 'noopener');
},
} : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl && !instance.donationUrl) ? undefined : { type: 'divider' }, {
text: i18n.ts.help,
icon: 'ph-question ph-bold ph-lg',
text: i18n.ts.document,
icon: 'ph-libghtbulb ph-bold ph-lg',
action: () => {
window.open('https://misskey-hub.net/docs/for-users/', '_blank', 'noopener');
},