forked from mirrors/misskey
Merge branch 'develop'
This commit is contained in:
commit
a1af83c0ab
|
@ -7,6 +7,11 @@
|
||||||
|
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
## 12.93.1 (2021/10/23)
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- クライアント: 通知上でローカルのリアクションが表示されないのを修正
|
||||||
|
|
||||||
## 12.93.0 (2021/10/23)
|
## 12.93.0 (2021/10/23)
|
||||||
|
|
||||||
### Improvements
|
### Improvements
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"author": "syuilo <syuilotan@yahoo.co.jp>",
|
"author": "syuilo <syuilotan@yahoo.co.jp>",
|
||||||
"version": "12.93.0",
|
"version": "12.93.1",
|
||||||
"codename": "indigo",
|
"codename": "indigo",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
|
@ -13,7 +13,8 @@
|
||||||
<i v-else-if="notification.type === 'mention'" class="fas fa-at"></i>
|
<i v-else-if="notification.type === 'mention'" class="fas fa-at"></i>
|
||||||
<i v-else-if="notification.type === 'quote'" class="fas fa-quote-left"></i>
|
<i v-else-if="notification.type === 'quote'" class="fas fa-quote-left"></i>
|
||||||
<i v-else-if="notification.type === 'pollVote'" class="fas fa-poll-h"></i>
|
<i v-else-if="notification.type === 'pollVote'" class="fas fa-poll-h"></i>
|
||||||
<XReactionIcon v-else-if="notification.type === 'reaction'" :reaction="notification.reaction" :custom-emojis="notification.note.emojis" :no-style="true"/>
|
<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
|
||||||
|
<XReactionIcon v-else-if="notification.type === 'reaction'" :reaction="notification.reaction ? notification.reaction.replace(/^:(\w+):$/, ':$1@.:') : notification.reaction" :custom-emojis="notification.note.emojis" :no-style="true"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="tail">
|
<div class="tail">
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<div class="title">{{ $ts.misskeyUpdated }}</div>
|
<div class="title">{{ $ts.misskeyUpdated }}</div>
|
||||||
<div class="version">✨{{ version }}🚀</div>
|
<div class="version">✨{{ version }}🚀</div>
|
||||||
<MkButton full @click="whatIsNew">{{ $ts.whatIsNew }}</MkButton>
|
<MkButton full @click="whatIsNew">{{ $ts.whatIsNew }}</MkButton>
|
||||||
<MkButton primary full @click="$refs.modal.close()">{{ $ts.gotIt }}</MkButton>
|
<MkButton class="gotIt" primary full @click="$refs.modal.close()">{{ $ts.gotIt }}</MkButton>
|
||||||
</div>
|
</div>
|
||||||
</MkModal>
|
</MkModal>
|
||||||
</template>
|
</template>
|
||||||
|
@ -54,5 +54,9 @@ export default defineComponent({
|
||||||
> .version {
|
> .version {
|
||||||
margin: 1em 0;
|
margin: 1em 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
> .gotIt {
|
||||||
|
margin: 8px 0 0 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in a new issue