Merge branch 'master' into l10n_master
BIN
assets/icons/128.png
Normal file
After Width: | Height: | Size: 3.1 KiB |
BIN
assets/icons/16.png
Normal file
After Width: | Height: | Size: 446 B |
BIN
assets/icons/192.png
Normal file
After Width: | Height: | Size: 4.6 KiB |
BIN
assets/icons/256.png
Normal file
After Width: | Height: | Size: 4.7 KiB |
BIN
assets/icons/32.png
Normal file
After Width: | Height: | Size: 774 B |
BIN
assets/icons/64.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
|
@ -47,7 +47,7 @@ common:
|
|||
ok: "OK"
|
||||
update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates."
|
||||
my-token-regenerated: "Your token has been renewed so you will be signed out."
|
||||
i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
|
||||
i-like-sushi: "I like sushi rather than pudding"
|
||||
widgets:
|
||||
analog-clock: "Analog clock"
|
||||
profile: "Profile"
|
||||
|
|
|
@ -52,6 +52,7 @@ common:
|
|||
ok: "わかった"
|
||||
update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
|
||||
my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
|
||||
i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
|
||||
|
||||
widgets:
|
||||
analog-clock: "アナログ時計"
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"name": "misskey",
|
||||
"author": "syuilo <i@syuilo.com>",
|
||||
"version": "4.1.1",
|
||||
"clientVersion": "1.0.6542",
|
||||
"version": "4.3.0",
|
||||
"clientVersion": "1.0.6630",
|
||||
"codename": "nighthike",
|
||||
"main": "./built/index.js",
|
||||
"private": true,
|
||||
|
@ -215,9 +215,7 @@
|
|||
"webpack-cli": "2.1.4",
|
||||
"websocket": "1.0.26",
|
||||
"ws": "5.2.0",
|
||||
"xev": "2.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"xev": "2.0.1",
|
||||
"@types/file-type": "5.2.1",
|
||||
"@types/jsdom": "11.0.5"
|
||||
}
|
||||
|
|
|
@ -8,7 +8,10 @@
|
|||
<img v-if="reaction == 'congrats'" src="/assets/reactions/congrats.png" alt="%i18n:common.reactions.congrats%">
|
||||
<img v-if="reaction == 'angry'" src="/assets/reactions/angry.png" alt="%i18n:common.reactions.angry%">
|
||||
<img v-if="reaction == 'confused'" src="/assets/reactions/confused.png" alt="%i18n:common.reactions.confused%">
|
||||
<img v-if="reaction == 'pudding'" src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%">
|
||||
<template v-if="reaction == 'pudding'">
|
||||
<img v-if="$store.getters.isSignedIn && $store.state.settings.iLikeSushi" src="/assets/reactions/sushi.png" alt="%i18n:common.reactions.pudding%">
|
||||
<img v-else src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%">
|
||||
</template>
|
||||
</span>
|
||||
</template>
|
||||
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
<mk-switch v-model="darkmode" text="%i18n:@dark-mode%"/>
|
||||
<mk-switch v-model="$store.state.settings.circleIcons" @change="onChangeCircleIcons" text="%i18n:@circle-icons%"/>
|
||||
<mk-switch v-model="$store.state.settings.gradientWindowHeader" @change="onChangeGradientWindowHeader" text="%i18n:@gradient-window-header%"/>
|
||||
<mk-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi" text="%i18n:common.i-like-sushi%"/>
|
||||
</div>
|
||||
<mk-switch v-model="$store.state.settings.showPostFormOnTopOfTl" @change="onChangeShowPostFormOnTopOfTl" text="%i18n:@post-form-on-timeline%"/>
|
||||
<mk-switch v-model="$store.state.settings.showReplyTarget" @change="onChangeShowReplyTarget" text="%i18n:@show-reply-target%"/>
|
||||
|
@ -362,6 +363,12 @@ export default Vue.extend({
|
|||
value: v
|
||||
});
|
||||
},
|
||||
onChangeILikeSushi(v) {
|
||||
this.$store.dispatch('settings/set', {
|
||||
key: 'iLikeSushi',
|
||||
value: v
|
||||
});
|
||||
},
|
||||
onChangeGradientWindowHeader(v) {
|
||||
this.$store.dispatch('settings/set', {
|
||||
key: 'gradientWindowHeader',
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<h1 v-else><img :src="$store.state.device.darkmode ? 'assets/title.dark.svg' : 'assets/title.light.svg'" alt="Misskey"></h1>
|
||||
<p class="powerd-by" v-if="name">powerd by <b>Misskey</b></p>
|
||||
<p class="desc" v-html="description || '%i18n:common.about%'"></p>
|
||||
<a ref="signup" @click="signup">%i18n:@signup%</a>
|
||||
<a ref="signup" @click="signup">📦 %i18n:@signup%</a>
|
||||
</div>
|
||||
<div class="login">
|
||||
<mk-signin/>
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
<ui-switch v-model="darkmode">%i18n:@dark-mode%</ui-switch>
|
||||
<ui-switch v-model="$store.state.settings.circleIcons" @change="onChangeCircleIcons">%i18n:@circle-icons%</ui-switch>
|
||||
<ui-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi">%i18n:common.i-like-sushi%</ui-switch>
|
||||
|
||||
<div>
|
||||
<div>%i18n:@timeline%</div>
|
||||
|
@ -174,6 +175,13 @@ export default Vue.extend({
|
|||
});
|
||||
},
|
||||
|
||||
onChangeILikeSushi(v) {
|
||||
this.$store.dispatch('settings/set', {
|
||||
key: 'iLikeSushi',
|
||||
value: v
|
||||
});
|
||||
},
|
||||
|
||||
onChangeShowReplyTarget(v) {
|
||||
this.$store.dispatch('settings/set', {
|
||||
key: 'showReplyTarget',
|
||||
|
|
|
@ -18,7 +18,8 @@ const defaultSettings = {
|
|||
showRenotedMyNotes: true,
|
||||
loadRemoteMedia: true,
|
||||
disableViaMobile: false,
|
||||
memo: null
|
||||
memo: null,
|
||||
iLikeSushi: false
|
||||
};
|
||||
|
||||
const defaultDeviceSettings = {
|
||||
|
|
|
@ -6,33 +6,33 @@
|
|||
"background_color": "#313a42",
|
||||
"icons": [
|
||||
{
|
||||
"src": "/assets/favicon/16.png",
|
||||
"size": "16x16",
|
||||
"src": "/assets/icons/16.png",
|
||||
"sizes": "16x16",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "/assets/favicon/32.png",
|
||||
"size": "32x32",
|
||||
"src": "/assets/icons/32.png",
|
||||
"sizes": "32x32",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "/assets/favicon/64.png",
|
||||
"size": "64x64",
|
||||
"src": "/assets/icons/64.png",
|
||||
"sizes": "64x64",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "/assets/favicon/128.png",
|
||||
"size": "128x128",
|
||||
"src": "/assets/icons/128.png",
|
||||
"sizes": "128x128",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "/assets/favicon/192.png",
|
||||
"size": "192x192",
|
||||
"src": "/assets/icons/192.png",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "/assets/favicon/256.png",
|
||||
"size": "256x256",
|
||||
"src": "/assets/icons/256.png",
|
||||
"sizes": "256x256",
|
||||
"type": "image/png"
|
||||
}
|
||||
],
|
||||
|
|
BIN
src/client/assets/reactions/sushi.png
Normal file
After Width: | Height: | Size: 8.4 KiB |
|
@ -49,9 +49,7 @@ const router = new Router();
|
|||
//#region static assets
|
||||
|
||||
router.get('/assets/*', async ctx => {
|
||||
// 互換性のため
|
||||
const path = ctx.path.replace('.raw.js', '.js').replace('.min.js', '.js');
|
||||
await send(ctx, path, {
|
||||
await send(ctx, ctx.path, {
|
||||
root: client,
|
||||
maxage: ms('7 days'),
|
||||
immutable: true
|
||||
|
|