From 834edd216cf46a743cbff8bafa71b67ecc3f6d82 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Mon, 27 May 2019 20:04:01 +0900 Subject: [PATCH 01/17] Fix #4894 (#5000) --- src/client/app/common/views/components/signup.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/common/views/components/signup.vue b/src/client/app/common/views/components/signup.vue index bf8e5d25b..421d09a4d 100644 --- a/src/client/app/common/views/components/signup.vue +++ b/src/client/app/common/views/components/signup.vue @@ -43,7 +43,7 @@
- {{ $t('create') }} + {{ $t('create') }} From 07d5bce61a218d4d11c898b1fb227c1dd520d84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Mon, 27 May 2019 23:15:46 +0900 Subject: [PATCH 02/17] Update README.md [AUTOGEN] (#5001) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 28abc57f8..db9e59071 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). CG Hekovic Naoki Hirayama -dansup Satsuki Yanagi takimura @@ -163,19 +162,20 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). CG Hekovic Naoki Hirayama -dansup + +
dansup Gargron Nokotaro Takeda Takashi Shibuya
dansup Gargron Nokotaro Takeda Takashi Shibuya
-**Last updated:** Sun, 19 May 2019 02:37:06 UTC +**Last updated:** Mon, 27 May 2019 13:43:05 UTC :four_leaf_clover: Copyright From b9f1a551903b4a0ae16e5032d3bab5742724f15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Mon, 27 May 2019 23:44:44 +0900 Subject: [PATCH 03/17] Update README.md [AUTOGEN] (#5003) --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index db9e59071..ec31eb46d 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). Hiroshi Seki weepjp kiritan +Denshi ne_moni Melilot osapon @@ -114,6 +115,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). Hiroshi Seki weepjp kiritan +Denshi ne_moni Melilot osapon @@ -175,7 +177,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). Takashi Shibuya -**Last updated:** Mon, 27 May 2019 13:43:05 UTC +**Last updated:** Mon, 27 May 2019 14:16:07 UTC :four_leaf_clover: Copyright From aff80199e5b8d0f27f13b3679378c4b0a60e920f Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 29 May 2019 12:22:47 +0900 Subject: [PATCH 04/17] Fix bug --- src/server/api/endpoints/admin/drive/clean-remote-files.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/api/endpoints/admin/drive/clean-remote-files.ts b/src/server/api/endpoints/admin/drive/clean-remote-files.ts index a861052bb..69cfe0db9 100644 --- a/src/server/api/endpoints/admin/drive/clean-remote-files.ts +++ b/src/server/api/endpoints/admin/drive/clean-remote-files.ts @@ -12,7 +12,8 @@ export const meta = { export default define(meta, async (ps, me) => { const files = await DriveFiles.find({ - userHost: Not(IsNull()) + userHost: Not(IsNull()), + isLink: false, }); for (const file of files) { From dee48fff12823fd10cea1a13577ed7525b01def6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sat, 1 Jun 2019 20:38:46 +0900 Subject: [PATCH 05/17] Update README.md [AUTOGEN] (#5013) --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ec31eb46d..e3d8ad33a 100644 --- a/README.md +++ b/README.md @@ -107,21 +107,22 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). weepjp kiritan Denshi +mkatze ne_moni Melilot osapon -見当かなみ Hiroshi Seki weepjp kiritan Denshi +mkatze ne_moni Melilot osapon -見当かなみ + @@ -132,6 +133,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). + @@ -177,7 +179,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
見当かなみ YuzuRyo61 gutfuckllc mydarkstarSampot sheeta.s
見当かなみ YuzuRyo61 gutfuckllc mydarkstarTakashi Shibuya
-**Last updated:** Mon, 27 May 2019 14:16:07 UTC +**Last updated:** Sat, 01 Jun 2019 01:18:06 UTC :four_leaf_clover: Copyright From 9969cf8816d93c7e8d092d3d4aab70e692cf751f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sun, 2 Jun 2019 10:13:11 +0900 Subject: [PATCH 06/17] Update README.md [AUTOGEN] (#5017) --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index e3d8ad33a..c3ec690e6 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). - @@ -158,7 +157,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). - @@ -179,7 +177,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
Satsuki Yanagi takimuraDamillora Atsuko Tominaga natalie Hiratake
Satsuki Yanagi takimuraDamillora Atsuko Tominaga natalie HiratakeTakashi Shibuya
-**Last updated:** Sat, 01 Jun 2019 01:18:06 UTC +**Last updated:** Sat, 01 Jun 2019 22:09:07 UTC :four_leaf_clover: Copyright From 83fedcff3b6bfa206a2f42b9d297057b325f5caa Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Tue, 4 Jun 2019 18:03:56 +0900 Subject: [PATCH 07/17] Add missing semicolon (#5030) --- src/client/app/mios.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts index fb1e7e13e..ae1446b93 100644 --- a/src/client/app/mios.ts +++ b/src/client/app/mios.ts @@ -282,7 +282,7 @@ export default class MiOS extends EventEmitter { // トークンが再生成されたとき // このままではMisskeyが利用できないので強制的にサインアウトさせる main.on('myTokenRegenerated', () => { - alert(locale['common']['my-token-regenerated']) + alert(locale['common']['my-token-regenerated']); this.signout(); }); } From d559aa8e6d46a86993f2ef950a31fed0f7058c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Tue, 4 Jun 2019 18:19:16 +0900 Subject: [PATCH 08/17] Update README.md [AUTOGEN] (#5025) --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c3ec690e6..8d7ca4b54 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). + @@ -157,6 +158,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md). + @@ -177,7 +179,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
Satsuki Yanagi takimuraDamillora Atsuko Tominaga natalie Hiratake
Satsuki Yanagi takimuraDamillora Atsuko Tominaga natalie HiratakeTakashi Shibuya
-**Last updated:** Sat, 01 Jun 2019 22:09:07 UTC +**Last updated:** Tue, 04 Jun 2019 04:21:06 UTC :four_leaf_clover: Copyright From a8ff1e19dc4c1fed64e605225e0ad97a20881883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Tue, 4 Jun 2019 23:06:30 +0900 Subject: [PATCH 09/17] Add resolutions for polluted packages for yarn users: Just `yarn install` then vulnerabilities are fixed! for npm users: Wait for support of 'resolutions' from npm. --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index b6615ed5b..3e7dde6c1 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,10 @@ "test": "gulp test", "format": "gulp format" }, + "resolutions": { + "gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1", + "video-thumbnail-generator/lodash": "^4.17.11" + }, "dependencies": { "@elastic/elasticsearch": "7.0.0-rc.2", "@fortawesome/fontawesome-svg-core": "1.2.15", From 4436852de017c32d5f8d02a6feb405829c287d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Thu, 6 Jun 2019 19:45:25 +0900 Subject: [PATCH 10/17] Deny 'private' in note visibility (#5031) Fixes #5028 --- src/server/api/endpoints/notes/create.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts index 6cd84b866..46db27458 100644 --- a/src/server/api/endpoints/notes/create.ts +++ b/src/server/api/endpoints/notes/create.ts @@ -40,7 +40,7 @@ export const meta = { params: { visibility: { - validator: $.optional.str.or(['public', 'home', 'followers', 'specified', 'private']), + validator: $.optional.str.or(['public', 'home', 'followers', 'specified']), default: 'public', desc: { 'ja-JP': '投稿の公開範囲' From 8b2098fc894834059acd16e3a58573164d50f2d0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 7 Jun 2019 20:11:23 +0900 Subject: [PATCH 11/17] Fix bug --- src/client/app/common/views/components/url.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/app/common/views/components/url.vue b/src/client/app/common/views/components/url.vue index 078c81652..b22a10097 100644 --- a/src/client/app/common/views/components/url.vue +++ b/src/client/app/common/views/components/url.vue @@ -21,10 +21,10 @@ export default Vue.extend({ props: ['url', 'rel'], data() { const isSelf = this.url.startsWith(local); - const hasRoute = + const hasRoute = isSelf && ( this.url.substr(local.length).startsWith('/@') || this.url.substr(local.length).startsWith('/notes/') || - this.url.substr(local.length).startsWith('/pages/'); + this.url.substr(local.length).startsWith('/pages/')); return { local, schema: null, From dacc713f99208b6d8784ee4156264127c1ee3246 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 7 Jun 2019 20:24:07 +0900 Subject: [PATCH 12/17] Fix #5021 --- .../app/common/views/pages/page/page.vue | 58 ++++++++++++------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue index 7938d706b..96a2cfafb 100644 --- a/src/client/app/common/views/pages/page/page.vue +++ b/src/client/app/common/views/pages/page/page.vue @@ -1,5 +1,5 @@