1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-14 14:48:53 +09:00

Merge branch 'develop'

This commit is contained in:
syuilo 2019-04-15 22:09:10 +09:00
commit ff625253ce
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
6 changed files with 10 additions and 7 deletions

View File

@ -5,6 +5,13 @@ If you encounter any problems with updating, please try the following:
1. `npm run clean` or `npm run cleanall` 1. `npm run clean` or `npm run cleanall`
2. Retry update (Don't forget `npm i`) 2. Retry update (Don't forget `npm i`)
11.1.1 (2019/04/15)
-------------------
### Fixes
* Metaタグの application-name を Misskey で固定するように修正
* トークメッセージが既読にならない問題を修正
* デフォルトでHTLを表示するように
11.1.0 (2019/04/15) 11.1.0 (2019/04/15)
------------------- -------------------
### Improvements ### Improvements

View File

@ -1,7 +1,7 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "11.1.0", "version": "11.1.1",
"codename": "daybreak", "codename": "daybreak",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -88,8 +88,6 @@ export default Vue.extend({
} else if (this.src == 'tag') { } else if (this.src == 'tag') {
this.tagTl = this.$store.state.device.tl.arg; this.tagTl = this.$store.state.device.tl.arg;
} }
} else if (this.$store.state.i.followingCount == 0) {
this.src = 'hybrid';
} }
}, },

View File

@ -130,8 +130,6 @@ export default Vue.extend({
} else if (this.src == 'tag') { } else if (this.src == 'tag') {
this.tagTl = this.$store.state.device.tl.arg; this.tagTl = this.$store.state.device.tl.arg;
} }
} else if (this.$store.state.i.followingCount == 0) {
this.src = 'hybrid';
} }
}, },

View File

@ -23,7 +23,7 @@ export default class extends Channel {
public onMessage(type: string, body: any) { public onMessage(type: string, body: any) {
switch (type) { switch (type) {
case 'read': case 'read':
read(this.user!.id, this.otherpartyId, body.id); read(this.user!.id, this.otherpartyId, [body.id]);
break; break;
} }
} }

View File

@ -8,7 +8,7 @@ html
head head
meta(charset='utf-8') meta(charset='utf-8')
meta(name='application-name' content= title || 'Misskey') meta(name='application-name' content='Misskey')
meta(name='referrer' content='origin') meta(name='referrer' content='origin')
meta(name='theme-color' content='#105779') meta(name='theme-color' content='#105779')
meta(property='og:site_name' content= title || 'Misskey') meta(property='og:site_name' content= title || 'Misskey')