From d848195a6ee2a3251a3122713b0d11de0cf47bf7 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Fri, 5 Jul 2019 21:13:52 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=81=A7=E6=95=B0=E5=AD=97=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/app/common/views/components/activity.vue | 3 +++ src/client/app/common/views/deck/deck.hashtag-column.vue | 3 +++ src/client/app/common/views/deck/deck.user-column.home.vue | 3 +++ src/client/app/common/views/widgets/queue.vue | 3 +++ 4 files changed, 12 insertions(+) diff --git a/src/client/app/common/views/components/activity.vue b/src/client/app/common/views/components/activity.vue index 395d764fb8..a958616943 100644 --- a/src/client/app/common/views/components/activity.vue +++ b/src/client/app/common/views/components/activity.vue @@ -72,6 +72,9 @@ export default Vue.extend({ columnWidth: '80%' } }, + dataLabels: { + enabled: false + }, grid: { clipMarkers: false, padding: { diff --git a/src/client/app/common/views/deck/deck.hashtag-column.vue b/src/client/app/common/views/deck/deck.hashtag-column.vue index 1af1632581..0d719c2199 100644 --- a/src/client/app/common/views/deck/deck.hashtag-column.vue +++ b/src/client/app/common/views/deck/deck.hashtag-column.vue @@ -73,6 +73,9 @@ export default Vue.extend({ enabled: true }, }, + dataLabels: { + enabled: false + }, grid: { clipMarkers: false, padding: { diff --git a/src/client/app/common/views/deck/deck.user-column.home.vue b/src/client/app/common/views/deck/deck.user-column.home.vue index 49cc869eb9..56b117a7dd 100644 --- a/src/client/app/common/views/deck/deck.user-column.home.vue +++ b/src/client/app/common/views/deck/deck.user-column.home.vue @@ -163,6 +163,9 @@ export default Vue.extend({ columnWidth: '80%' } }, + dataLabels: { + enabled: false + }, grid: { clipMarkers: false, padding: { diff --git a/src/client/app/common/views/widgets/queue.vue b/src/client/app/common/views/widgets/queue.vue index 27ba35fbcd..6e49f1efb0 100644 --- a/src/client/app/common/views/widgets/queue.vue +++ b/src/client/app/common/views/widgets/queue.vue @@ -90,6 +90,9 @@ export default define({ enabled: true, } }, + dataLabels: { + enabled: false + }, tooltip: { enabled: false }, From 68d49bc77021669104b57ba140f2bcb4d2759435 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Fri, 5 Jul 2019 21:18:49 +0900 Subject: [PATCH 2/8] Add PB --- src/client/app/common/views/filters/bytes.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/common/views/filters/bytes.ts b/src/client/app/common/views/filters/bytes.ts index 5b5d966cfd..227ccae3a4 100644 --- a/src/client/app/common/views/filters/bytes.ts +++ b/src/client/app/common/views/filters/bytes.ts @@ -2,7 +2,7 @@ import Vue from 'vue'; Vue.filter('bytes', (v, digits = 0) => { if (v == null) return '?'; - const sizes = ['B', 'KB', 'MB', 'GB', 'TB']; + const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']; if (v == 0) return '0'; const isMinus = v < 0; if (isMinus) v = -v; From af583d2ef6d9507ee7796b6c763ceeb3ee96e9f8 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Fri, 5 Jul 2019 21:21:09 +0900 Subject: [PATCH 3/8] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7783896256..3e13f407e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,12 @@ npm i -g ts-node npm run migrate ``` +unreleased +-------------------- +### 🐛Fixes +* チャートに数字が表示される問題を修正 +* ペタバイト単位が表示できない問題を修正 + 11.24.1 (2019/07/05) -------------------- ### 🐛Fixes From 87a6ef058199bd610fefc1113d25f19320f22288 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri, 5 Jul 2019 21:47:18 +0900 Subject: [PATCH 4/8] =?UTF-8?q?Fix:=20SingleLine=E3=81=AAMFM=E3=81=8C?= =?UTF-8?q?=E6=8A=98=E3=82=8A=E8=BF=94=E3=81=95=E3=82=8C=E3=81=A6=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=86=20(#5109)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/views/components/misskey-flavored-markdown.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.vue b/src/client/app/common/views/components/misskey-flavored-markdown.vue index fa24f6dfa4..a0ecbecbb2 100644 --- a/src/client/app/common/views/components/misskey-flavored-markdown.vue +++ b/src/client/app/common/views/components/misskey-flavored-markdown.vue @@ -1,5 +1,5 @@ <template> -<mfm-core v-bind="$attrs" class="havbbuyv" v-once/> +<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ plain: $attrs['plain-text'] }" v-once/> </template> <script lang="ts"> @@ -17,6 +17,9 @@ export default Vue.extend({ .havbbuyv white-space pre-wrap + &.plain + white-space pre + >>> .title display block margin-bottom 4px From 65bf863093a3ba5d9bcf4509b81188e03a1b43b9 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Fri, 5 Jul 2019 22:32:15 +0900 Subject: [PATCH 5/8] Fix #4760 --- src/services/chart/core.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/services/chart/core.ts b/src/services/chart/core.ts index d5fd9a5c5c..a3bd80d16b 100644 --- a/src/services/chart/core.ts +++ b/src/services/chart/core.ts @@ -446,7 +446,9 @@ export default abstract class Chart<T extends Record<string, any>> { if (typeof v == 'object') { dive(v, p); } else { - nestedProperty.set(res, p, chart.map(s => nestedProperty.get(s, p))); + const values = chart.map(s => nestedProperty.get(s, p)) + .map(v => parseInt(v, 10)); // TypeORMのバグ(?)で何故か数値カラムの値が文字列型になっているので数値に戻す + nestedProperty.set(res, p, values); } } }; From fb3fa06ae7c9d083c976c8c55fa616563004ca24 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Fri, 5 Jul 2019 22:33:54 +0900 Subject: [PATCH 6/8] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e13f407e4..276da7ad6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ npm run migrate unreleased -------------------- ### 🐛Fixes +* チャートAPIの返り値が文字列になっていることがある問題を修正 * チャートに数字が表示される問題を修正 * ペタバイト単位が表示できない問題を修正 From c76c1fc4ef84d4a74300504ec429b4031f73ac66 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Fri, 5 Jul 2019 22:34:34 +0900 Subject: [PATCH 7/8] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 276da7ad6a..2840114a9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ unreleased * チャートAPIの返り値が文字列になっていることがある問題を修正 * チャートに数字が表示される問題を修正 * ペタバイト単位が表示できない問題を修正 +* SingleLineなMFMが折り返されてしまう問題を修正 11.24.1 (2019/07/05) -------------------- From 3bc2fe85278803092d195742b1772d7853ab3f21 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Fri, 5 Jul 2019 22:35:52 +0900 Subject: [PATCH 8/8] 11.24.2 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2840114a9d..b2b0b1dda4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ npm i -g ts-node npm run migrate ``` -unreleased +11.24.2 (2019/07/05) -------------------- ### 🐛Fixes * チャートAPIの返り値が文字列になっていることがある問題を修正 diff --git a/package.json b/package.json index e5d2806998..b113b8f7c3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo <i@syuilo.com>", - "version": "11.24.1", + "version": "11.24.2", "codename": "daybreak", "repository": { "type": "git",