summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-15 22:09:10 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-15 22:09:10 +0900
commitff625253ceb32fe4a4acb65ffa1e46abac948349 (patch)
tree00d0c6fd434623ec08ba4767edaaae0ea85b4886
parentMerge branch 'develop' (diff)
parent11.1.1 (diff)
downloadmisskey-ff625253ceb32fe4a4acb65ffa1e46abac948349.tar.gz
misskey-ff625253ceb32fe4a4acb65ffa1e46abac948349.tar.bz2
misskey-ff625253ceb32fe4a4acb65ffa1e46abac948349.zip
Merge branch 'develop'
-rw-r--r--CHANGELOG.md7
-rw-r--r--package.json2
-rw-r--r--src/client/app/desktop/views/home/timeline.vue2
-rw-r--r--src/client/app/mobile/views/pages/home.vue2
-rw-r--r--src/server/api/stream/channels/messaging.ts2
-rw-r--r--src/server/web/views/base.pug2
6 files changed, 10 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf207d0052..cd2cd6a0fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ If you encounter any problems with updating, please try the following:
1. `npm run clean` or `npm run cleanall`
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)
-------------------
### Improvements
diff --git a/package.json b/package.json
index 8fe0129f31..7754832512 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
- "version": "11.1.0",
+ "version": "11.1.1",
"codename": "daybreak",
"repository": {
"type": "git",
diff --git a/src/client/app/desktop/views/home/timeline.vue b/src/client/app/desktop/views/home/timeline.vue
index f257f1fa97..1e6abac823 100644
--- a/src/client/app/desktop/views/home/timeline.vue
+++ b/src/client/app/desktop/views/home/timeline.vue
@@ -88,8 +88,6 @@ export default Vue.extend({
} else if (this.src == 'tag') {
this.tagTl = this.$store.state.device.tl.arg;
}
- } else if (this.$store.state.i.followingCount == 0) {
- this.src = 'hybrid';
}
},
diff --git a/src/client/app/mobile/views/pages/home.vue b/src/client/app/mobile/views/pages/home.vue
index af008ae26e..0d110bf2ee 100644
--- a/src/client/app/mobile/views/pages/home.vue
+++ b/src/client/app/mobile/views/pages/home.vue
@@ -130,8 +130,6 @@ export default Vue.extend({
} else if (this.src == 'tag') {
this.tagTl = this.$store.state.device.tl.arg;
}
- } else if (this.$store.state.i.followingCount == 0) {
- this.src = 'hybrid';
}
},
diff --git a/src/server/api/stream/channels/messaging.ts b/src/server/api/stream/channels/messaging.ts
index 8397f849ff..ce766e28e9 100644
--- a/src/server/api/stream/channels/messaging.ts
+++ b/src/server/api/stream/channels/messaging.ts
@@ -23,7 +23,7 @@ export default class extends Channel {
public onMessage(type: string, body: any) {
switch (type) {
case 'read':
- read(this.user!.id, this.otherpartyId, body.id);
+ read(this.user!.id, this.otherpartyId, [body.id]);
break;
}
}
diff --git a/src/server/web/views/base.pug b/src/server/web/views/base.pug
index 8e0595e905..e61d29685a 100644
--- a/src/server/web/views/base.pug
+++ b/src/server/web/views/base.pug
@@ -8,7 +8,7 @@ html
head
meta(charset='utf-8')
- meta(name='application-name' content= title || 'Misskey')
+ meta(name='application-name' content='Misskey')
meta(name='referrer' content='origin')
meta(name='theme-color' content='#105779')
meta(property='og:site_name' content= title || 'Misskey')