diff --git a/assets/icons/128.png b/assets/icons/128.png new file mode 100644 index 000000000..6b00970da --- /dev/null +++ b/assets/icons/128.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f44939dd372202e33ad5065a0e0b3f05031627961a59c1b87829eb6253067042 +size 3143 diff --git a/assets/icons/16.png b/assets/icons/16.png new file mode 100644 index 000000000..4242ce749 --- /dev/null +++ b/assets/icons/16.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89ad19f254862300592b4f7e0978b223adf88f5f6e6e96b125b397299f1753ca +size 446 diff --git a/assets/icons/192.png b/assets/icons/192.png new file mode 100644 index 000000000..d134dae6a --- /dev/null +++ b/assets/icons/192.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a68d3bb2aa5534ade047144744126fd119ceb6e86d68421229b3d8274b5496ba +size 4666 diff --git a/assets/icons/256.png b/assets/icons/256.png new file mode 100644 index 000000000..b06bbe907 --- /dev/null +++ b/assets/icons/256.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d52f93b719d434dd11ab5d8b4b334402bfdb604ca99c018a1176e286cd42ae26 +size 4824 diff --git a/assets/icons/32.png b/assets/icons/32.png new file mode 100644 index 000000000..a9a95ea90 --- /dev/null +++ b/assets/icons/32.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e69c47ed93bf729f2c23a6fb2e33e4abb01d4d8eafee22aaa224cd93fcca303 +size 774 diff --git a/assets/icons/64.png b/assets/icons/64.png new file mode 100644 index 000000000..419787497 --- /dev/null +++ b/assets/icons/64.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75dc868e81c786a16972f41d1866acc65b9221843fced13d041522aaef147823 +size 1330 diff --git a/locales/en.yml b/locales/en.yml index 3290b9642..535bb2fce 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -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" diff --git a/locales/ja.yml b/locales/ja.yml index 29decefe6..f2a85eb4e 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -52,6 +52,7 @@ common: ok: "わかった" update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。" my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。" + i-like-sushi: "私は(プリンよりむしろ)寿司が好き" widgets: analog-clock: "アナログ時計" diff --git a/package.json b/package.json index 669172338..9961782c9 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo ", - "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" } diff --git a/src/client/app/common/views/components/reaction-icon.vue b/src/client/app/common/views/components/reaction-icon.vue index 7d24f4f9e..2d5391a21 100644 --- a/src/client/app/common/views/components/reaction-icon.vue +++ b/src/client/app/common/views/components/reaction-icon.vue @@ -8,7 +8,10 @@ %i18n:common.reactions.congrats% %i18n:common.reactions.angry% %i18n:common.reactions.confused% - %i18n:common.reactions.pudding% + diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index c660c2869..536d270dc 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -45,6 +45,7 @@ + @@ -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', diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue index 70fa0123a..029e44e27 100644 --- a/src/client/app/desktop/views/pages/welcome.vue +++ b/src/client/app/desktop/views/pages/welcome.vue @@ -13,7 +13,7 @@

Misskey

powerd by Misskey

- %i18n:@signup% + 📦 %i18n:@signup%