diff --git a/.gitignore b/.gitignore index f11e4e4769..98ee82cd7e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ api-docs.json /elasticsearch *.code-workspace yarn.lock +.DS_Store diff --git a/CHANGELOG.md b/CHANGELOG.md index edc7cfd800..4308790a08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ChangeLog unreleased ---------- * アクティブユーザー数のチャートを追加 +* ログイン時に二段階認証が分かりにくいのを改善 * 投稿のツールチップを出すのは時間の上だけに変更 * ハッシュタグ判定の強化 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index f644c9e658..c5301a4e76 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/package.json b/package.json index 49be6d0361..d81a39bea1 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", @@ -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", @@ -109,11 +109,11 @@ "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", - "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", @@ -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", @@ -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", diff --git a/src/client/app/common/views/components/signin.vue b/src/client/app/common/views/components/signin.vue index 724efdfc18..93d19edf22 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 78f8d9ccd2..bd17018a6f 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -196,7 +196,7 @@ -
{{ $t('2fa') }}
+
{{ $t('@.2fa') }}
diff --git a/src/client/app/init.ts b/src/client/app/init.ts index cbd49b3690..7eb53eb7a5 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,