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 1/6] Update README.md [AUTOGEN] (#5013) --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ec31eb46db..e3d8ad33ab 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 2/6] Update README.md [AUTOGEN] (#5017) --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index e3d8ad33ab..c3ec690e6f 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 3/6] 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 fb1e7e13ec..ae1446b934 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 4/6] Update README.md [AUTOGEN] (#5025) --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c3ec690e6f..8d7ca4b54b 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 5/6] 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 b6615ed5b0..3e7dde6c18 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 6/6] 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 6cd84b866f..46db274581 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': '投稿の公開範囲'