From dce347a11757ac8285c7a251c6c6d5e4134f12f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 14 Jan 2019 20:30:05 +0000 Subject: [PATCH 1/9] Update elasticsearch requirement from 15.2.0 to 15.3.0 Updates the requirements on [elasticsearch](https://github.com/elastic/elasticsearch-js) to permit the latest version. - [Release notes](https://github.com/elastic/elasticsearch-js/releases) - [Changelog](https://github.com/elastic/elasticsearch-js/blob/master/docs/changelog.asciidoc) - [Commits](https://github.com/elastic/elasticsearch-js/commits/v15.3.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d3486d9fe..67441a24f 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "deepcopy": "0.6.3", "diskusage": "1.0.0", "double-ended-queue": "2.1.0-0", - "elasticsearch": "15.2.0", + "elasticsearch": "15.3.0", "emojilib": "2.4.0", "escape-regexp": "0.0.1", "eslint": "5.12.0", From 9798a9bf153a50293b6c115d674a43351385b949 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 16 Jan 2019 20:22:52 +0000 Subject: [PATCH 2/9] Update @fortawesome/vue-fontawesome requirement from 0.1.2 to 0.1.5 Updates the requirements on [@fortawesome/vue-fontawesome](https://github.com/FortAwesome/vue-fontawesome) to permit the latest version. - [Release notes](https://github.com/FortAwesome/vue-fontawesome/releases) - [Changelog](https://github.com/FortAwesome/vue-fontawesome/blob/master/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/vue-fontawesome/commits/0.1.5) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 114404e70..adc53a4f6 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@fortawesome/free-brands-svg-icons": "5.6.3", "@fortawesome/free-regular-svg-icons": "5.5.0", "@fortawesome/free-solid-svg-icons": "5.6.3", - "@fortawesome/vue-fontawesome": "0.1.2", + "@fortawesome/vue-fontawesome": "0.1.5", "@koa/cors": "2.2.3", "@prezzemolo/rap": "0.1.2", "@prezzemolo/zip": "0.0.3", From 02b90325876c2138b5b4d08b646605b37c9c5897 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 18 Jan 2019 03:53:42 +0000 Subject: [PATCH 3/9] Update webpack requirement from 4.28.3 to 4.28.4 Updates the requirements on [webpack](https://github.com/webpack/webpack) to permit the latest version. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/commits/v4.28.4) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49be6d036..20f6fbe1a 100644 --- a/package.json +++ b/package.json @@ -241,7 +241,7 @@ "vuex-persistedstate": "2.5.4", "web-push": "3.3.3", "webfinger.js": "2.7.0", - "webpack": "4.28.3", + "webpack": "4.28.4", "webpack-cli": "3.2.1", "websocket": "1.0.28", "ws": "6.1.2", From d93e60d4dda2c3ddf7a2acdb3f31f23df5495400 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: Fri, 18 Jan 2019 13:20:32 +0900 Subject: [PATCH 4/9] Better 2FA input on sign in form (#3910) * Update signin.vue * Update ja-JP.yml * Update settings.vue * Update signin.vue * Update init.ts --- locales/ja-JP.yml | 2 +- src/client/app/common/views/components/signin.vue | 5 ++++- src/client/app/desktop/views/components/settings.vue | 2 +- src/client/app/init.ts | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index a7796c4d1..0fbbe69c6 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -27,6 +27,7 @@ common: do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。" load-more: "もっと読み込む" enter-password: "パスワードを入力してください" + 2fa: "二段階認証" got-it: "わかった" customization-tips: @@ -855,7 +856,6 @@ desktop/views/components/settings.vue: security: "セキュリティ" signin: "サインイン履歴" password: "パスワード" - 2fa: "二段階認証" other: "その他" license: "ライセンス" theme: "テーマ" diff --git a/src/client/app/common/views/components/signin.vue b/src/client/app/common/views/components/signin.vue index 7efbde38b..296863a48 100644 --- a/src/client/app/common/views/components/signin.vue +++ b/src/client/app/common/views/components/signin.vue @@ -10,7 +10,10 @@ {{ $t('password') }} - + + {{ $t('@.2fa') }} + + {{ signing ? $t('signing-in') : $t('signin') }}

{{ $t('signin-with-twitter') }}

{{ $t('signin-with-github') }}

diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index 5ffe69ef4..991412f27 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -203,7 +203,7 @@ -
{{ $t('2fa') }}
+
{{ $t('@.2fa') }}
diff --git a/src/client/app/init.ts b/src/client/app/init.ts index cbd49b369..7eb53eb7a 100644 --- a/src/client/app/init.ts +++ b/src/client/app/init.ts @@ -124,7 +124,8 @@ import { faMapMarker, faRobot, faHourglassHalf, - faAlignLeft + faAlignLeft, + faGavel } from '@fortawesome/free-solid-svg-icons'; import { @@ -257,6 +258,7 @@ library.add( faRobot, faHourglassHalf, faAlignLeft, + faGavel, farBell, farEnvelope, From 41dc729d95c473271dde5d0fab79fbc71b27eb6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 18 Jan 2019 14:40:34 +0900 Subject: [PATCH 5/9] Update @types/showdown requirement from 1.9.1 to 1.9.2 (#3912) Updates the requirements on [@types/showdown](https://github.com/DefinitelyTyped/DefinitelyTyped) to permit the latest version. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49be6d036..8cfe83ecf 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@types/rimraf": "2.0.2", "@types/seedrandom": "2.4.27", "@types/sharp": "0.21.0", - "@types/showdown": "1.9.1", + "@types/showdown": "1.9.2", "@types/speakeasy": "2.0.3", "@types/systeminformation": "3.23.1", "@types/tinycolor2": "1.4.1", From 9851612acf13187f8b5a19a269f7cf985f8271bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 18 Jan 2019 14:41:13 +0900 Subject: [PATCH 6/9] Update eslint-plugin-vue requirement from 5.0.0 to 5.1.0 (#3887) Updates the requirements on [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) to permit the latest version. - [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases) - [Commits](https://github.com/vuejs/eslint-plugin-vue/commits/v5.1.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 56e6562cd..75544294a 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "emojilib": "2.4.0", "escape-regexp": "0.0.1", "eslint": "5.12.0", - "eslint-plugin-vue": "5.0.0", + "eslint-plugin-vue": "5.1.0", "eventemitter3": "3.1.0", "feed": "2.0.2", "file-loader": "2.0.0", From 9df620a520462309053592bb5aa3cfcfe0343f06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 18 Jan 2019 14:41:23 +0900 Subject: [PATCH 7/9] Update js-yaml requirement from 3.12.0 to 3.12.1 (#3902) Updates the requirements on [js-yaml](https://github.com/nodeca/js-yaml) to permit the latest version. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/commits/3.12.1) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 75544294a..9c2921358 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "is-root": "2.0.0", "is-svg": "3.0.0", "is-url": "1.2.4", - "js-yaml": "3.12.0", + "js-yaml": "3.12.1", "jsdom": "13.1.0", "json5": "2.1.0", "json5-loader": "1.0.1", From deeb53661323bedbe5c80a5d21dffd567e911324 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 18 Jan 2019 15:42:12 +0900 Subject: [PATCH 8/9] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index edc7cfd80..4308790a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ChangeLog unreleased ---------- * アクティブユーザー数のチャートを追加 +* ログイン時に二段階認証が分かりにくいのを改善 * 投稿のツールチップを出すのは時間の上だけに変更 * ハッシュタグ判定の強化 From 1aa274e10de8d0fa7a5c7b9dccd208863ac9a38f 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: Fri, 18 Jan 2019 16:04:06 +0900 Subject: [PATCH 9/9] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f11e4e476..98ee82cd7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ api-docs.json /elasticsearch *.code-workspace yarn.lock +.DS_Store