From 34e1b52b3846eaa5b599cf0cad13581e4e44eb45 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 5 Jun 2023 17:45:24 +0900 Subject: [PATCH 1/7] Update e2e.js --- cypress/support/e2e.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js index 9185be344c..827a326d18 100644 --- a/cypress/support/e2e.js +++ b/cypress/support/e2e.js @@ -21,6 +21,8 @@ import './commands' Cypress.on('uncaught:exception', (err, runnable) => { if ([ + 'The source image cannot be decoded', + // Chrome 'ResizeObserver loop limit exceeded', From 9e716fd8135e85402e266551b2c9be6220f5eead Mon Sep 17 00:00:00 2001 From: tamaina Date: Mon, 5 Jun 2023 08:58:00 +0000 Subject: [PATCH 2/7] =?UTF-8?q?fix(frontend):=20MkUserPopup=E3=81=8C?= =?UTF-8?q?=E7=9C=81=E7=95=A5=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=AE?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20Fix=20#10870?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/components/MkUserPopup.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue index c9ff02cc76..c3b777a12e 100644 --- a/packages/frontend/src/components/MkUserPopup.vue +++ b/packages/frontend/src/components/MkUserPopup.vue @@ -22,7 +22,7 @@
- +
{{ i18n.ts.noAccountDescription }}
@@ -192,6 +192,13 @@ onMounted(() => { border-bottom: solid 1px var(--divider); } +.mfm { + display: -webkit-box; + -webkit-line-clamp: 5; + -webkit-box-orient: vertical; + overflow: hidden; +} + .status { padding: 16px 26px 16px 26px; } From 565c502bbf67fffc9cd045f364c7b2d49b2329e8 Mon Sep 17 00:00:00 2001 From: tamaina Date: Mon, 5 Jun 2023 09:04:30 +0000 Subject: [PATCH 3/7] =?UTF-8?q?fix(backend):=20page=E3=81=AE=E3=83=94?= =?UTF-8?q?=E3=83=B3=E7=95=99=E3=82=81=E3=82=92=E8=A7=A3=E9=99=A4=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=A7=E3=81=8D=E3=81=AA?= =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20Fix=20?= =?UTF-8?q?#10950?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + packages/backend/src/server/api/endpoints/i/update.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb8ab8f30f..a063006566 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ - Fix: 無効化されたアンテナにアクセスがあった際に再度有効化するように - Fix: お知らせの画像URLを空にできない問題を修正 - Fix: i/notificationsのsinceIdが機能しない問題を修正 +- Fix: pageのピン留めを解除することができない問題を修正 ## 13.12.2 diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index d10f690a32..8f5e6177c2 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -146,7 +146,7 @@ export const paramDef = { alwaysMarkNsfw: { type: 'boolean' }, autoSensitive: { type: 'boolean' }, ffVisibility: { type: 'string', enum: ['public', 'followers', 'private'] }, - pinnedPageId: { type: 'string', format: 'misskey:id' }, + pinnedPageId: { type: 'string', format: 'misskey:id', nullable: true }, mutedWords: { type: 'array' }, mutedInstances: { type: 'array', items: { type: 'string', From 4443dba71790761016c5b84d56b1462949a97752 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 5 Jun 2023 18:04:51 +0900 Subject: [PATCH 4/7] Update basic.cy.js --- cypress/e2e/basic.cy.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cypress/e2e/basic.cy.js b/cypress/e2e/basic.cy.js index 652e0c2d70..2515c14ad6 100644 --- a/cypress/e2e/basic.cy.js +++ b/cypress/e2e/basic.cy.js @@ -169,25 +169,20 @@ describe('After user signed in', () => { cy.get('[data-cy-user-setup-user-description] textarea').type('ほげ'); // TODO: アイコン設定テスト - cy.get('[data-cy-user-setup-back]').click(); cy.get('[data-cy-user-setup-continue]').click(); // プライバシー設定 - cy.get('[data-cy-user-setup-back]').click(); cy.get('[data-cy-user-setup-continue]').click(); // フォローはスキップ - cy.get('[data-cy-user-setup-back]').click(); cy.get('[data-cy-user-setup-continue]').click(); // プッシュ通知設定はスキップ - cy.get('[data-cy-user-setup-back]').click(); cy.get('[data-cy-user-setup-continue]').click(); - cy.get('[data-cy-user-setup-back]').click(); cy.get('[data-cy-user-setup-continue]').click(); }); }); From 618d07158a7425448d57002f4a398f3276e39155 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 5 Jun 2023 18:05:03 +0900 Subject: [PATCH 5/7] 13.13.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 81029514c3..8cf7d37f63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "13.13.0-beta.7", + "version": "13.13.0", "codename": "nasubi", "repository": { "type": "git", From 6b0685a25c5eb08df232516f77f86bbb55492dfe Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 5 Jun 2023 18:05:20 +0900 Subject: [PATCH 6/7] [ci skip] New Crowdin updates (#10947) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Chinese Traditional) --- locales/ko-KR.yml | 2 +- locales/zh-TW.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index c36305137c..fd46eef1ff 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -870,7 +870,7 @@ instanceDefaultLightTheme: "서버 기본 라이트 테마" instanceDefaultDarkTheme: "서버 기본 다크 테마" instanceDefaultThemeDescription: "객체 형식의 테마 코드를 입력해 주세요." mutePeriod: "뮤트할 기간" -period: "투표 기한" +period: "기간" indefinitely: "무기한" tenMinutes: "10분" oneHour: "1시간" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 04c14b2c65..ef0baeef50 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1060,6 +1060,8 @@ cancelReactionConfirm: "要取消做出的反應嗎？" changeReactionConfirm: "要變更做出的反應嗎？" later: "稍後再說" goToMisskey: "往Misskey" +additionalEmojiDictionary: "表情符號的附加辭典" +installed: "已安裝" _initialAccountSetting: accountCreated: "帳戶已建立完成！" letsStartAccountSetup: "來進行帳戶的初始設定吧。" From 2d5bb40ad0be6ea1066b4a383682cfbe2332e813 Mon Sep 17 00:00:00 2001 From: Yuriha <121590760+yuriha-chan@users.noreply.github.com> Date: Mon, 5 Jun 2023 18:06:33 +0900 Subject: [PATCH 7/7] Condensedlines reflow once (#10944) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf: Update MkCondensedLine styles after reading all dimensions * perf: reduce reflow in MkCondensedLine * lint * Update packages/frontend/src/components/global/MkCondensedLine.vue Co-authored-by: Acid Chicken (硫酸鶏) * Update packages/frontend/src/components/global/MkCondensedLine.vue Co-authored-by: Acid Chicken (硫酸鶏) --------- Co-authored-by: syuilo Co-authored-by: Acid Chicken (硫酸鶏) --- .../frontend/src/components/global/MkCondensedLine.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/components/global/MkCondensedLine.vue b/packages/frontend/src/components/global/MkCondensedLine.vue index 1d46ff1ec9..4b2e8e4750 100644 --- a/packages/frontend/src/components/global/MkCondensedLine.vue +++ b/packages/frontend/src/components/global/MkCondensedLine.vue @@ -13,13 +13,20 @@ interface Props { const contentSymbol = Symbol(); const observer = new ResizeObserver((entries) => { + const results: { + container: HTMLSpanElement; + transform: string; + }[] = []; for (const entry of entries) { const content = (entry.target[contentSymbol] ? entry.target : entry.target.firstElementChild) as HTMLSpanElement; const props: Required = content[contentSymbol]; const container = content.parentElement as HTMLSpanElement; const contentWidth = content.getBoundingClientRect().width; const containerWidth = container.getBoundingClientRect().width; - container.style.transform = `scaleX(${Math.max(props.minScale, Math.min(1, containerWidth / contentWidth))})`; + results.push({ container, transform: `scaleX(${Math.max(props.minScale, Math.min(1, containerWidth / contentWidth))})` }); + } + for (const result of results) { + result.container.style.transform = result.transform; } });