From 4ce330c59eb88edeb5269878bdfacf77d2a7a222 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 11 May 2020 22:43:50 +0900 Subject: [PATCH 1/7] refactor(client): Add note --- src/client/scripts/room/furnitures.json5 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/scripts/room/furnitures.json5 b/src/client/scripts/room/furnitures.json5 index 7c1a90a3f9..c731e85a9f 100644 --- a/src/client/scripts/room/furnitures.json5 +++ b/src/client/scripts/room/furnitures.json5 @@ -1,5 +1,7 @@ // 家具メタデータ +// 家具IDはglbファイル及びそのディレクトリ名と一致する必要があります + // 家具にはユーザーが設定できるプロパティを設定可能です: // // props: { From b2d3d43c977eb1fb51b3e646ef4da986821d2a8d Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri, 15 May 2020 20:37:05 +0900 Subject: [PATCH 2/7] =?UTF-8?q?reCAPTCHA=E3=81=8C=E5=8B=95=E3=81=8B?= =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#6367)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/components/signup.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/components/signup.vue b/src/client/components/signup.vue index 6452afc886..acb6a745ab 100644 --- a/src/client/components/signup.vue +++ b/src/client/components/signup.vue @@ -183,7 +183,7 @@ export default Vue.extend({ password: this.password, invitationCode: this.invitationCode, 'hcaptcha-response': this.hCaptchaResponse, - 'g-recaptcha-response': this.meta.reCaptchaResponse, + 'g-recaptcha-response': this.reCaptchaResponse, }).then(() => { this.$root.api('signin', { username: this.username, From 65efe1f42cc01069218767e6b10594cc435782fc Mon Sep 17 00:00:00 2001 From: DW <36347199+chocological00@users.noreply.github.com> Date: Fri, 15 May 2020 07:39:11 -0400 Subject: [PATCH 3/7] Add an indicator to make the undo renote button look more interactable (#6366) * Add an indicator to make the undo renote button look more interactable * Use faEllipsisH :art Co-authored-by: DW Co-authored-by: syuilo --- src/client/components/note.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/client/components/note.vue b/src/client/components/note.vue index 76e9ddb4ba..f30173200e 100644 --- a/src/client/components/note.vue +++ b/src/client/components/note.vue @@ -21,7 +21,10 @@
- + @@ -85,7 +88,7 @@