mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey synced 2024-07-06 17:16:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
syuilo 2020-03-28 22:35:19 +09:00
parent f014a79f8d b36a1a9d0e
commit 97d25bc6a3
9 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/apple-touch-icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
assets/icon.svg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
assets/icons/192.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
assets/icons/512.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 18 KiB

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <syuilotan@yahoo.co.jp>", "author": "syuilo <syuilotan@yahoo.co.jp>",
"version": "12.27.0", "version": "12.27.1",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",

6
src/client/components/signin.vue
View file

@ -12,9 +12,9 @@
<template #prefix><fa :icon="faLock"/></template> <template #prefix><fa :icon="faLock"/></template>
</mk-input> </mk-input>
<mk-button type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? $t('loggingIn') : $t('login') }}</mk-button> <mk-button type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? $t('loggingIn') : $t('login') }}</mk-button>
<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`"><fa :icon="faTwitter"/> {{ $t('signinWith', { x: 'Twitter' }) }}</a></p> <a class="_panel _button" style="margin: 8px auto;" v-if="meta && meta.enableTwitterIntegration" :href="`${apiUrl}/signin/twitter`"><fa :icon="faTwitter" style="margin-right: 4px;"/>{{ $t('signinWith', { x: 'Twitter' }) }}</a>
<p v-if="meta && meta.enableGithubIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`"><fa :icon="faGithub"/> {{ $t('signinWith', { x: 'GitHub' }) }}</a></p> <a class="_panel _button" style="margin: 8px auto;" v-if="meta && meta.enableGithubIntegration" :href="`${apiUrl}/signin/github`"><fa :icon="faGithub" style="margin-right: 4px;"/>{{ $t('signinWith', { x: 'GitHub' }) }}</a>
<p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`"><fa :icon="faDiscord"/> {{ $t('signinWith', { x: 'Discord' }) }}</a></p> <a class="_panel _button" style="margin: 8px auto;" v-if="meta && meta.enableDiscordIntegration" :href="`${apiUrl}/signin/discord`"><fa :icon="faDiscord" style="margin-right: 4px;"/>{{ $t('signinWith', { x: 'Discord' }) }}</a>
</div> </div>
<div class="2fa-signin" v-if="totpLogin" :class="{ securityKeys: user && user.securityKeys }"> <div class="2fa-signin" v-if="totpLogin" :class="{ securityKeys: user && user.securityKeys }">
<div v-if="user && user.securityKeys" class="twofa-group tap-group"> <div v-if="user && user.securityKeys" class="twofa-group tap-group">

1
src/client/pages/messaging/messaging-room.message.vue
View file

@ -214,6 +214,7 @@ export default Vue.extend({
width: 100%; width: 100%;
max-height: 512px; max-height: 512px;
object-fit: contain; object-fit: contain;
box-sizing: border-box;
} }
> p { > p {

3
src/server/api/endpoints/i/apps.ts
View file

@ -20,7 +20,8 @@ export const meta = {
}; };
export default define(meta, async (ps, user) => { export default define(meta, async (ps, user) => {
const query = AccessTokens.createQueryBuilder('token'); const query = AccessTokens.createQueryBuilder('token')
.where('token.userId = :userId', { userId: user.id });
switch (ps.sort) { switch (ps.sort) {
case '+createdAt': query.orderBy('token.createdAt', 'DESC'); break; case '+createdAt': query.orderBy('token.createdAt', 'DESC'); break;

2
src/server/api/index.ts
View file

@ -82,7 +82,7 @@ router.post('/miauth/:session/check', async ctx => {
AccessTokens.update(token.id, { AccessTokens.update(token.id, {
fetched: true fetched: true
}); });
ctx.body = { ctx.body = {
ok: true, ok: true,
token: token.token, token: token.token,