mirror of
https://github.com/misskey-dev/misskey
synced 2024-12-15 15:18:27 +09:00
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
e78e5274d3
@ -373,6 +373,7 @@ members: "メンバー"
|
|||||||
transfer: "譲渡"
|
transfer: "譲渡"
|
||||||
messagingWithUser: "ユーザーとチャット"
|
messagingWithUser: "ユーザーとチャット"
|
||||||
messagingWithGroup: "グループでチャット"
|
messagingWithGroup: "グループでチャット"
|
||||||
|
enable: "有効にする"
|
||||||
|
|
||||||
_2fa:
|
_2fa:
|
||||||
alreadyRegistered: "既に設定は完了しています。"
|
alreadyRegistered: "既に設定は完了しています。"
|
||||||
|
@ -193,6 +193,7 @@ export default Vue.extend({
|
|||||||
return {
|
return {
|
||||||
'p': this.post,
|
'p': this.post,
|
||||||
'n': this.post,
|
'n': this.post,
|
||||||
|
's': this.search,
|
||||||
'h|/': this.help
|
'h|/': this.help
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="mk-notes" v-size="[{ max: 500 }]">
|
<div class="mk-notes" v-size="[{ max: 500 }]">
|
||||||
<div class="empty _panel" v-if="empty">
|
<div class="empty" v-if="empty">
|
||||||
<img src="https://xn--931a.moe/assets/info.jpg" alt=""/>
|
<img src="https://xn--931a.moe/assets/info.jpg" alt=""/>
|
||||||
<div>{{ $t('noNotes') }}</div>
|
<div>{{ $t('noNotes') }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -713,7 +713,7 @@ export default Vue.extend({
|
|||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
color: var(--fg);
|
color: var(--fg);
|
||||||
font-family: initial;
|
font-family: inherit;
|
||||||
|
|
||||||
@media (max-width: 500px) {
|
@media (max-width: 500px) {
|
||||||
padding: 0 16px;
|
padding: 0 16px;
|
||||||
|
@ -327,14 +327,16 @@ export default Vue.extend({
|
|||||||
}
|
}
|
||||||
|
|
||||||
> input {
|
> input {
|
||||||
|
$height: 32px;
|
||||||
display: block;
|
display: block;
|
||||||
|
height: $height;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
font: inherit;
|
font: inherit;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
line-height: 32px;
|
line-height: $height;
|
||||||
color: var(--inputText);
|
color: var(--inputText);
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
|
@ -120,30 +120,30 @@
|
|||||||
<section class="_card">
|
<section class="_card">
|
||||||
<div class="_title"><fa :icon="faShareAlt"/> {{ $t('integration') }}</div>
|
<div class="_title"><fa :icon="faShareAlt"/> {{ $t('integration') }}</div>
|
||||||
<div class="_content">
|
<div class="_content">
|
||||||
<header><fa :icon="faTwitter"/> {{ $t('twitter-integration-config') }}</header>
|
<header><fa :icon="faTwitter"/> Twitter</header>
|
||||||
<mk-switch v-model="enableTwitterIntegration">{{ $t('enable-twitter-integration') }}</mk-switch>
|
<mk-switch v-model="enableTwitterIntegration">{{ $t('enable') }}</mk-switch>
|
||||||
<template v-if="enableTwitterIntegration">
|
<template v-if="enableTwitterIntegration">
|
||||||
<mk-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('twitter-integration-consumer-key') }}</mk-input>
|
<mk-info>Callback URL: {{ `${url}/api/tw/cb` }}</mk-info>
|
||||||
<mk-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('twitter-integration-consumer-secret') }}</mk-input>
|
<mk-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><template #icon><fa :icon="faKey"/></template>Consumer Key</mk-input>
|
||||||
<mk-info>{{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }}</mk-info>
|
<mk-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><template #icon><fa :icon="faKey"/></template>Consumer Secret</mk-input>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div class="_content">
|
<div class="_content">
|
||||||
<header><fa :icon="faGithub"/> {{ $t('github-integration-config') }}</header>
|
<header><fa :icon="faGithub"/> GitHub</header>
|
||||||
<mk-switch v-model="enableGithubIntegration">{{ $t('enable-github-integration') }}</mk-switch>
|
<mk-switch v-model="enableGithubIntegration">{{ $t('enable') }}</mk-switch>
|
||||||
<template v-if="enableGithubIntegration">
|
<template v-if="enableGithubIntegration">
|
||||||
<mk-input v-model="githubClientId" :disabled="!enableGithubIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('github-integration-client-id') }}</mk-input>
|
<mk-info>Callback URL: {{ `${url}/api/gh/cb` }}</mk-info>
|
||||||
<mk-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('github-integration-client-secret') }}</mk-input>
|
<mk-input v-model="githubClientId" :disabled="!enableGithubIntegration"><template #icon><fa :icon="faKey"/></template>Client ID</mk-input>
|
||||||
<mk-info>{{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }}</mk-info>
|
<mk-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><template #icon><fa :icon="faKey"/></template>Client Secret</mk-input>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div class="_content">
|
<div class="_content">
|
||||||
<header><fa :icon="faDiscord"/> {{ $t('discord-integration-config') }}</header>
|
<header><fa :icon="faDiscord"/> Discord</header>
|
||||||
<mk-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</mk-switch>
|
<mk-switch v-model="enableDiscordIntegration">{{ $t('enable') }}</mk-switch>
|
||||||
<template v-if="enableDiscordIntegration">
|
<template v-if="enableDiscordIntegration">
|
||||||
<mk-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('discord-integration-client-id') }}</mk-input>
|
<mk-info>Callback URL: {{ `${url}/api/dc/cb` }}</mk-info>
|
||||||
<mk-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><template #icon><fa :icon="faKey"/></template>{{ $t('discord-integration-client-secret') }}</mk-input>
|
<mk-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><template #icon><fa :icon="faKey"/></template>Client ID</mk-input>
|
||||||
<mk-info>{{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }}</mk-info>
|
<mk-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><template #icon><fa :icon="faKey"/></template>Client Secret</mk-input>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div class="_footer">
|
<div class="_footer">
|
||||||
@ -180,7 +180,7 @@ import MkTextarea from '../../components/ui/textarea.vue';
|
|||||||
import MkSwitch from '../../components/ui/switch.vue';
|
import MkSwitch from '../../components/ui/switch.vue';
|
||||||
import MkInfo from '../../components/ui/info.vue';
|
import MkInfo from '../../components/ui/info.vue';
|
||||||
import MkUserSelect from '../../components/user-select.vue';
|
import MkUserSelect from '../../components/user-select.vue';
|
||||||
import { version } from '../../config';
|
import { version, url } from '../../config';
|
||||||
import i18n from '../../i18n';
|
import i18n from '../../i18n';
|
||||||
import getAcct from '../../../misc/acct/render';
|
import getAcct from '../../../misc/acct/render';
|
||||||
|
|
||||||
@ -204,6 +204,7 @@ export default Vue.extend({
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
version,
|
version,
|
||||||
|
url,
|
||||||
meta: null,
|
meta: null,
|
||||||
stats: null,
|
stats: null,
|
||||||
serverInfo: null,
|
serverInfo: null,
|
||||||
|
@ -247,6 +247,7 @@ export default Vue.extend({
|
|||||||
padding: 16px 16px 0 16px;
|
padding: 16px 16px 0 16px;
|
||||||
resize: none;
|
resize: none;
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
|
font-family: inherit;
|
||||||
outline: none;
|
outline: none;
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
<portal to="avatar"><mk-avatar class="avatar" :user="user" :disable-preview="true"/></portal>
|
<portal to="avatar"><mk-avatar class="avatar" :user="user" :disable-preview="true"/></portal>
|
||||||
</template>
|
</template>
|
||||||
<template v-if="!fetching && group">
|
<template v-if="!fetching && group">
|
||||||
|
<portal to="icon"><fa :icon="faUsers"/></portal>
|
||||||
<portal to="title">{{ group.name }}</portal>
|
<portal to="title">{{ group.name }}</portal>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -35,7 +36,7 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import { faArrowCircleDown, faFlag } from '@fortawesome/free-solid-svg-icons';
|
import { faArrowCircleDown, faFlag, faUsers } from '@fortawesome/free-solid-svg-icons';
|
||||||
import i18n from '../i18n';
|
import i18n from '../i18n';
|
||||||
import XList from '../components/date-separated-list.vue';
|
import XList from '../components/date-separated-list.vue';
|
||||||
import XMessage from './messaging-room.message.vue';
|
import XMessage from './messaging-room.message.vue';
|
||||||
@ -63,7 +64,7 @@ export default Vue.extend({
|
|||||||
connection: null,
|
connection: null,
|
||||||
showIndicator: false,
|
showIndicator: false,
|
||||||
timer: null,
|
timer: null,
|
||||||
faArrowCircleDown, faFlag
|
faArrowCircleDown, faFlag, faUsers
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ export default Vue.extend({
|
|||||||
showCancelButton: true
|
showCancelButton: true
|
||||||
});
|
});
|
||||||
if (canceled) return;
|
if (canceled) return;
|
||||||
this.navigateGroup(group);
|
this.$router.push(`/my/messaging/group/${group.id}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -31,6 +31,7 @@ export const router = new VueRouter({
|
|||||||
{ path: '/my/mentions', component: page('mentions') },
|
{ path: '/my/mentions', component: page('mentions') },
|
||||||
{ path: '/my/messaging', name: 'messaging', component: page('messaging') },
|
{ path: '/my/messaging', name: 'messaging', component: page('messaging') },
|
||||||
{ path: '/my/messaging/:user', component: page('messaging-room') },
|
{ path: '/my/messaging/:user', component: page('messaging-room') },
|
||||||
|
{ path: '/my/messaging/group/:group', component: page('messaging-room') },
|
||||||
{ path: '/my/drive', name: 'drive', component: page('drive') },
|
{ path: '/my/drive', name: 'drive', component: page('drive') },
|
||||||
{ path: '/my/drive/folder/:folder', component: page('drive') },
|
{ path: '/my/drive/folder/:folder', component: page('drive') },
|
||||||
{ path: '/my/pages', name: 'pages', component: page('pages') },
|
{ path: '/my/pages', name: 'pages', component: page('pages') },
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
<tr><td><kbd class="key">P</kbd>, <kbd class="key">N</kbd></td><td>新規投稿</td><td><b>P</b>ost, <b>N</b>ew, <b>N</b>ote</td></tr>
|
<tr><td><kbd class="key">P</kbd>, <kbd class="key">N</kbd></td><td>新規投稿</td><td><b>P</b>ost, <b>N</b>ew, <b>N</b>ote</td></tr>
|
||||||
<tr><td><kbd class="key">T</kbd></td><td>タイムラインの最も新しい投稿にフォーカス</td><td><b>T</b>imeline, <b>T</b>op</td></tr>
|
<tr><td><kbd class="key">T</kbd></td><td>タイムラインの最も新しい投稿にフォーカス</td><td><b>T</b>imeline, <b>T</b>op</td></tr>
|
||||||
<tr><td><kbd class="group"><kbd class="key">Shift</kbd> + <kbd class="key">N</kbd></kbd></td><td>通知を表示/隠す</td><td><b>N</b>otifications</td></tr>
|
<tr><td><kbd class="group"><kbd class="key">Shift</kbd> + <kbd class="key">N</kbd></kbd></td><td>通知を表示/隠す</td><td><b>N</b>otifications</td></tr>
|
||||||
|
<tr><td><kbd class="key">S</kbd></td><td>検索</td><td><b>S</b>earch</td></tr>
|
||||||
<tr><td><kbd class="key">H</kbd>, <kbd class="key">?</kbd></td><td>ヘルプを表示</td><td><b>H</b>elp</td></tr>
|
<tr><td><kbd class="key">H</kbd>, <kbd class="key">?</kbd></td><td>ヘルプを表示</td><td><b>H</b>elp</td></tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
Loading…
Reference in New Issue
Block a user