summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-04-08 20:03:35 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-04-08 20:03:35 +0900
commitc5ccd826c8f504a8c4333c4ac4bb509a3b11cb75 (patch)
tree46aaf72b3ec1092d8d78c95414fb6506fc1fbe79
parentuse for of (diff)
parentfix(client): Fix antenna list infinite items loading (diff)
downloadsharkey-c5ccd826c8f504a8c4333c4ac4bb509a3b11cb75.tar.gz
sharkey-c5ccd826c8f504a8c4333c4ac4bb509a3b11cb75.tar.bz2
sharkey-c5ccd826c8f504a8c4333c4ac4bb509a3b11cb75.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
-rw-r--r--CHANGELOG.md2
-rw-r--r--packages/frontend/src/pages/my-antennas/index.vue1
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0243e6a173..f39e131db7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
### NOTE
- このバージョンからRedis 7.xが必要です。
-- アップデートを行うと全ての通知はリセットされます。
+- アップデートを行うと全ての通知およびアンテナのノートはリセットされます。
### General
- チャンネルをお気に入りに登録できるように
diff --git a/packages/frontend/src/pages/my-antennas/index.vue b/packages/frontend/src/pages/my-antennas/index.vue
index 9daf23f9b5..f1764b1aad 100644
--- a/packages/frontend/src/pages/my-antennas/index.vue
+++ b/packages/frontend/src/pages/my-antennas/index.vue
@@ -24,6 +24,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
const pagination = {
endpoint: 'antennas/list' as const,
+ noPaging: true,
limit: 10,
};