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

Merge branch 'art/dev' of https://github.com/Misskey-art/misskey into art/bump-2023.11.1

Browse source
This commit is contained in:
Zel9278 2023-11-23 17:52:34 +09:00
commit a29a6ddd8a
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/MkPostForm.vue
View file

@ -64,7 +64,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<button class="_buttonPrimary" style="padding: 4px; border-radius: 8px;" @click="addVisibleUser"><i class="ti ti-plus ti-fw"></i></button>
</div>
</div>
<MkInfo v-if="useCw" warn :class="$style.contentWarningCheckRule">{{ i18n.ts.contentWarningCheckRule }}</MkInfo>
<MkInfo v-show="useCw || 1 <= files.length" warn :class="$style.contentWarningCheckRule">{{ i18n.ts.contentWarningCheckRule }}</MkInfo>
<MkInfo v-if="hasNotSpecifiedMentions" warn :class="$style.hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
<input v-show="useCw" ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown">
<div :class="[$style.textOuter, { [$style.withCw]: useCw }]">

2
packages/frontend/src/pages/about-misskey.vue
View file

@ -29,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<FormSection>
<div class="_gaps_s">
<FormLink to="https://github.com/misskey-dev/misskey" external>
<FormLink to="https://github.com/Misskey-art/misskey" external>
<template #icon><i class="ti ti-code"></i></template>
{{ i18n.ts._aboutMisskey.source }}
<template #suffix>GitHub</template>

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

@ -97,18 +97,18 @@ export function openInstanceMenu(ev: MouseEvent) {
action: () => {
window.open(instance.privacyPolicyUrl, '_blank');
},
} : undefined, true ? {
text: i18n.ts.toServiceArt,
icon: 'ti ti-help-circle',
action: () => {
window.open('https://service.misskey.art', '_blank');
},
} : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : null, {
text: i18n.ts.help,
icon: 'ti ti-help-circle',
action: () => {
window.open('https://misskey-hub.net/help.html', '_blank');
},
}, {
text: i18n.ts.toServiceArt,
icon: 'ti ti-help-circle',
action: () => {
window.open('https://service.misskey.art', '_blank');
},
}, ($i) ? {
text: i18n.ts._initialTutorial.launchTutorial,
icon: 'ti ti-presentation',