Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
src/client/app/common/views/components/signin.vue
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>