Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2019-01-18 16:47:03 +09:00
commit abddea0443
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
7 changed files with 17 additions and 10 deletions

1
.gitignore vendored
View File

@ -18,3 +18,4 @@ api-docs.json
/elasticsearch
*.code-workspace
yarn.lock
.DS_Store

View File

@ -4,6 +4,7 @@ ChangeLog
unreleased
----------
* アクティブユーザー数のチャートを追加
* ログイン時に二段階認証が分かりにくいのを改善
* 投稿のツールチップを出すのは時間の上だけに変更
* ハッシュタグ判定の強化

View File

@ -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: "テーマ"

View File

@ -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",

View File

@ -10,7 +10,10 @@
<span>{{ $t('password') }}</span>
<span slot="prefix"><fa icon="lock"/></span>
</ui-input>
<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required styl="fill"/>
<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required styl="fill">
<span>{{ $t('@.2fa') }}</span>
<span slot="prefix"><fa icon="gavel"/></span>
</ui-input>
<ui-button type="submit" :disabled="signing">{{ signing ? $t('signing-in') : $t('signin') }}</ui-button>
<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`">{{ $t('signin-with-twitter') }}</a></p>
<p v-if="meta && meta.enableGithubIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`">{{ $t('signin-with-github') }}</a></p>

View File

@ -196,7 +196,7 @@
</ui-card>
<ui-card class="2fa" v-show="page == 'security'">
<div slot="title"><fa icon="mobile-alt"/> {{ $t('2fa') }}</div>
<div slot="title"><fa icon="mobile-alt"/> {{ $t('@.2fa') }}</div>
<section>
<x-2fa/>
</section>

View File

@ -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,