From 3ffe90146c306a16eb4f36360131db45ccdf1240 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 13:47:22 +0900 Subject: [PATCH 01/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 120e9fa5c0..7a10f5b811 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ ultimately sophisticated professional microblogging software. Become a Patron! -![](https://c10.patreonusercontent.com/3/e30%3D/patreon-posts/RsKWEDEKf8D_wYDQWAbex9CSb-1DnXW1nfqfLvuys5ROj2k0VF6_luuzHMTyf95n.png?token-time=1529539200&token-hash=RmcSP0947mw5o2-B6g1L6aU_OoDXANe198kLU6HMO30%3D) +![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg) :sparkles: Features ---------------------------------------------------------------- From da0d3e4129e37cdf6a16dc086c6ac2bac372ad5b Mon Sep 17 00:00:00 2001 From: otya Date: Mon, 25 Jun 2018 21:05:12 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=84v('=CF=89')v?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/de.yml | 2 +- locales/en.yml | 2 +- locales/es.yml | 2 +- locales/fr.yml | 2 +- locales/it.yml | 2 +- locales/ja.yml | 2 +- locales/ko.yml | 2 +- locales/pl.yml | 2 +- locales/pt.yml | 2 +- locales/ru.yml | 2 +- locales/zh.yml | 2 +- src/client/app/common/scripts/get-kao.ts | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/locales/de.yml b/locales/de.yml index 2348097ebe..4feec5b0cc 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "Medien von deinem PC hinzufügen" attach-media-from-drive: "Medien von deinem Speicher hinzufügen" attach-cancel: "Hinzufügen abbrechen" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Eine Abstimmung erstellen" text-remain: "{} Zeichen verbleibend" desktop/views/components/post-form-window.vue: diff --git a/locales/en.yml b/locales/en.yml index 645b4e9407..83d1c9e427 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "Attach media from your PC" attach-media-from-drive: "Attach media from your Drive" attach-cancel: "Cancel attachment" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Create a poll" text-remain: "{} characters remaining" desktop/views/components/post-form-window.vue: diff --git a/locales/es.yml b/locales/es.yml index da41dcb24f..944c8a6699 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "Adjunta multimedia desde tu Disco" attach-cancel: "Quitar el archivo adjunto" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Crea una encuesta" text-remain: "quedan {} caracteres" desktop/views/components/post-form-window.vue: diff --git a/locales/fr.yml b/locales/fr.yml index fb47c0db47..199c633eef 100644 --- a/locales/fr.yml +++ b/locales/fr.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "Joindre un media depuis votre PC" attach-media-from-drive: "Joindre un media depuis votre Drive" attach-cancel: "Annuler la jointure de fichier" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Créer un sondage" text-remain: "{} charactères restants" desktop/views/components/post-form-window.vue: diff --git a/locales/it.yml b/locales/it.yml index c911f7561e..4cd959cab4 100644 --- a/locales/it.yml +++ b/locales/it.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: diff --git a/locales/ja.yml b/locales/ja.yml index 0f1d9cd510..0d552565f2 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -461,7 +461,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" diff --git a/locales/ko.yml b/locales/ko.yml index c911f7561e..4cd959cab4 100644 --- a/locales/ko.yml +++ b/locales/ko.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: diff --git a/locales/pl.yml b/locales/pl.yml index 21a89fab8a..68fe4ea586 100644 --- a/locales/pl.yml +++ b/locales/pl.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "Załącz zawartość multimedialną z komputera" attach-media-from-drive: "Załącz zawartość multimedialną z dysku" attach-cancel: "Usuń załącznik" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Utwórz ankietę" text-remain: "pozostałe znaki: {}" desktop/views/components/post-form-window.vue: diff --git a/locales/pt.yml b/locales/pt.yml index 5627facd31..91c76e312f 100644 --- a/locales/pt.yml +++ b/locales/pt.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: diff --git a/locales/ru.yml b/locales/ru.yml index acf1115b00..32a787a43b 100644 --- a/locales/ru.yml +++ b/locales/ru.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: diff --git a/locales/zh.yml b/locales/zh.yml index d50544222c..23adc4a3b6 100644 --- a/locales/zh.yml +++ b/locales/zh.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: diff --git a/src/client/app/common/scripts/get-kao.ts b/src/client/app/common/scripts/get-kao.ts index 2168c5be88..d380187510 100644 --- a/src/client/app/common/scripts/get-kao.ts +++ b/src/client/app/common/scripts/get-kao.ts @@ -1,5 +1,5 @@ export default () => [ '(=^・・^=)', - 'v(‘ω’)v', + 'v('ω')v', '🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!' ][Math.floor(Math.random() * 3)]; From 04ef2f0c8d27ef3c8dadc0646b3cef5a90388d6d Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:02 +0900 Subject: [PATCH 03/16] New translations ja.yml (French) --- locales/fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/fr.yml b/locales/fr.yml index fb47c0db47..199c633eef 100644 --- a/locales/fr.yml +++ b/locales/fr.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "Joindre un media depuis votre PC" attach-media-from-drive: "Joindre un media depuis votre Drive" attach-cancel: "Annuler la jointure de fichier" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Créer un sondage" text-remain: "{} charactères restants" desktop/views/components/post-form-window.vue: From 74a25bfaa0bf4060c4d3b77cc18d97951c97fb73 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:05 +0900 Subject: [PATCH 04/16] New translations ja.yml (German) --- locales/de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/de.yml b/locales/de.yml index 2348097ebe..4feec5b0cc 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "Medien von deinem PC hinzufügen" attach-media-from-drive: "Medien von deinem Speicher hinzufügen" attach-cancel: "Hinzufügen abbrechen" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Eine Abstimmung erstellen" text-remain: "{} Zeichen verbleibend" desktop/views/components/post-form-window.vue: From 39094adfcfa99657cc3df9a96ebaa67043d19543 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:07 +0900 Subject: [PATCH 05/16] New translations ja.yml (Spanish) --- locales/es.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/es.yml b/locales/es.yml index da41dcb24f..944c8a6699 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "Adjunta multimedia desde tu Disco" attach-cancel: "Quitar el archivo adjunto" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Crea una encuesta" text-remain: "quedan {} caracteres" desktop/views/components/post-form-window.vue: From 35dedfc7e480db206c1b619a81087e619aef22cd Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:10 +0900 Subject: [PATCH 06/16] New translations ja.yml (English) --- locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.yml b/locales/en.yml index 645b4e9407..83d1c9e427 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "Attach media from your PC" attach-media-from-drive: "Attach media from your Drive" attach-cancel: "Cancel attachment" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Create a poll" text-remain: "{} characters remaining" desktop/views/components/post-form-window.vue: From 5d621f5318ea98567e4a05e7f76298163f889d53 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:12 +0900 Subject: [PATCH 07/16] New translations ja.yml (Russian) --- locales/ru.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/ru.yml b/locales/ru.yml index acf1115b00..32a787a43b 100644 --- a/locales/ru.yml +++ b/locales/ru.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: From ebf10b345221bef3be177e7182f2991050f74e74 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:15 +0900 Subject: [PATCH 08/16] New translations ja.yml (Italian) --- locales/it.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/it.yml b/locales/it.yml index c911f7561e..4cd959cab4 100644 --- a/locales/it.yml +++ b/locales/it.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: From e9a7e9910869fd2e3f0a871bbf06ffd48a8204ee Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:17 +0900 Subject: [PATCH 09/16] New translations ja.yml (Chinese Simplified) --- locales/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/zh.yml b/locales/zh.yml index d50544222c..23adc4a3b6 100644 --- a/locales/zh.yml +++ b/locales/zh.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: From 750f479d588f01e10cabf227cdc1e5aefb1b0650 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:20 +0900 Subject: [PATCH 10/16] New translations ja.yml (Polish) --- locales/pl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/pl.yml b/locales/pl.yml index 21a89fab8a..68fe4ea586 100644 --- a/locales/pl.yml +++ b/locales/pl.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "Załącz zawartość multimedialną z komputera" attach-media-from-drive: "Załącz zawartość multimedialną z dysku" attach-cancel: "Usuń załącznik" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "Utwórz ankietę" text-remain: "pozostałe znaki: {}" desktop/views/components/post-form-window.vue: From 4d53c813e4b94980137c307217a72958fd0733e8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:22 +0900 Subject: [PATCH 11/16] New translations ja.yml (Korean) --- locales/ko.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/ko.yml b/locales/ko.yml index c911f7561e..4cd959cab4 100644 --- a/locales/ko.yml +++ b/locales/ko.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: From 80519dc366b399cd2c818e85a989dff1527fe827 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 25 Jun 2018 21:52:24 +0900 Subject: [PATCH 12/16] New translations ja.yml (Portuguese) --- locales/pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/pt.yml b/locales/pt.yml index 5627facd31..91c76e312f 100644 --- a/locales/pt.yml +++ b/locales/pt.yml @@ -400,7 +400,7 @@ desktop/views/components/post-form.vue: attach-media-from-local: "PCからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付" attach-cancel: "添付取り消し" - insert-a-kao: "v(‘ω’)v" + insert-a-kao: "v('ω')v" create-poll: "アンケートを作成" text-remain: "残り{}文字" desktop/views/components/post-form-window.vue: From 89190821798a6009b870fe05c2189d6eb6fee392 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 25 Jun 2018 20:53:04 +0000 Subject: [PATCH 13/16] fix(package): update html-minifier to version 3.5.17 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb983830f9..790f6bb71a 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "gulp-util": "3.0.8", "hard-source-webpack-plugin": "0.9.0", "highlight.js": "9.12.0", - "html-minifier": "3.5.16", + "html-minifier": "3.5.17", "http-signature": "1.2.0", "inquirer": "6.0.0", "is-root": "2.0.0", From fd00c7bd81017463bd7f7d1c5965dfdb3b091755 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 26 Jun 2018 01:40:05 +0000 Subject: [PATCH 14/16] fix(package): update @types/node to version 10.3.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb983830f9..55bcf92791 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@types/mocha": "5.2.3", "@types/mongodb": "3.0.21", "@types/ms": "0.7.30", - "@types/node": "10.3.5", + "@types/node": "10.3.6", "@types/nopt": "3.0.29", "@types/parse5": "5.0.0", "@types/pug": "2.0.4", From 91c2b07cd8e9e01ea0b7601d53d2151612579e9b Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 26 Jun 2018 03:06:03 +0000 Subject: [PATCH 15/16] fix(package): update @types/webpack to version 4.4.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb983830f9..eb3cb4916e 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@types/speakeasy": "2.0.2", "@types/tmp": "0.0.33", "@types/uuid": "3.4.3", - "@types/webpack": "4.4.2", + "@types/webpack": "4.4.3", "@types/webpack-stream": "3.2.10", "@types/websocket": "0.0.39", "@types/ws": "5.1.2", From 19e9099a783f80e5e157f9668d0304d37b2754e1 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 26 Jun 2018 03:50:37 +0000 Subject: [PATCH 16/16] fix(package): update eslint to version 5.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb983830f9..012d3702ba 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "element-ui": "2.4.1", "emojilib": "2.2.12", "escape-regexp": "0.0.1", - "eslint": "5.0.0", + "eslint": "5.0.1", "eslint-plugin-vue": "4.5.0", "eventemitter3": "3.1.0", "exif-js": "2.3.0",