From 91bea1f6c70b374904f7f5c33b9c8e13dd668f2e Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 18 Jun 2018 14:52:36 +0900 Subject: :v: --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 6691723386..ca81a956a3 100644 --- a/package.json +++ b/package.json @@ -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" } -- cgit v1.2.3-freya From fe319a529f8d488dbdb915af33d8cd0a66b482e4 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 18 Jun 2018 14:54:09 +0900 Subject: 4.2.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ca81a956a3..d84a63bc99 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.2.0", + "clientVersion": "1.0.6620", "codename": "nighthike", "main": "./built/index.js", "private": true, -- cgit v1.2.3-freya From 4c4cb2bb17f72e30888208528486463a9ee46116 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 18 Jun 2018 15:05:38 +0900 Subject: :v: --- assets/icons/128.png | Bin 0 -> 3143 bytes assets/icons/16.png | Bin 0 -> 446 bytes assets/icons/192.png | Bin 0 -> 4666 bytes assets/icons/256.png | Bin 0 -> 4824 bytes assets/icons/32.png | Bin 0 -> 774 bytes assets/icons/64.png | Bin 0 -> 1330 bytes src/client/assets/manifest.json | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 assets/icons/128.png create mode 100644 assets/icons/16.png create mode 100644 assets/icons/192.png create mode 100644 assets/icons/256.png create mode 100644 assets/icons/32.png create mode 100644 assets/icons/64.png diff --git a/assets/icons/128.png b/assets/icons/128.png new file mode 100644 index 0000000000..0bfa5aeb3e Binary files /dev/null and b/assets/icons/128.png differ diff --git a/assets/icons/16.png b/assets/icons/16.png new file mode 100644 index 0000000000..9d3226d37a Binary files /dev/null and b/assets/icons/16.png differ diff --git a/assets/icons/192.png b/assets/icons/192.png new file mode 100644 index 0000000000..3fa9b0dab7 Binary files /dev/null and b/assets/icons/192.png differ diff --git a/assets/icons/256.png b/assets/icons/256.png new file mode 100644 index 0000000000..b3c4be42af Binary files /dev/null and b/assets/icons/256.png differ diff --git a/assets/icons/32.png b/assets/icons/32.png new file mode 100644 index 0000000000..29b3876cb8 Binary files /dev/null and b/assets/icons/32.png differ diff --git a/assets/icons/64.png b/assets/icons/64.png new file mode 100644 index 0000000000..ab35f8fec1 Binary files /dev/null and b/assets/icons/64.png differ diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json index 25be82fdc6..29ce9c6f16 100644 --- a/src/client/assets/manifest.json +++ b/src/client/assets/manifest.json @@ -6,32 +6,32 @@ "background_color": "#313a42", "icons": [ { - "src": "/assets/favicon/16.png", + "src": "/assets/icon/16.png", "size": "16x16", "type": "image/png" }, { - "src": "/assets/favicon/32.png", + "src": "/assets/icon/32.png", "size": "32x32", "type": "image/png" }, { - "src": "/assets/favicon/64.png", + "src": "/assets/icon/64.png", "size": "64x64", "type": "image/png" }, { - "src": "/assets/favicon/128.png", + "src": "/assets/icon/128.png", "size": "128x128", "type": "image/png" }, { - "src": "/assets/favicon/192.png", + "src": "/assets/icon/192.png", "size": "192x192", "type": "image/png" }, { - "src": "/assets/favicon/256.png", + "src": "/assets/icon/256.png", "size": "256x256", "type": "image/png" } -- cgit v1.2.3-freya From 0f0009e0dbad894f4586c79a938745284c1fb5d9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 18 Jun 2018 15:12:29 +0900 Subject: Clean up --- src/server/web/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/server/web/index.ts b/src/server/web/index.ts index d38d9165d4..050fc3c76c 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -49,8 +49,6 @@ 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, { root: client, maxage: ms('7 days'), -- cgit v1.2.3-freya From d805a70508ccbb8a0d3818435a83303768bb7775 Mon Sep 17 00:00:00 2001 From: tosuke Date: Mon, 18 Jun 2018 15:38:58 +0900 Subject: Fix path --- src/client/assets/manifest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json index 29ce9c6f16..540d220aad 100644 --- a/src/client/assets/manifest.json +++ b/src/client/assets/manifest.json @@ -6,32 +6,32 @@ "background_color": "#313a42", "icons": [ { - "src": "/assets/icon/16.png", + "src": "/assets/icons/16.png", "size": "16x16", "type": "image/png" }, { - "src": "/assets/icon/32.png", + "src": "/assets/icons/32.png", "size": "32x32", "type": "image/png" }, { - "src": "/assets/icon/64.png", + "src": "/assets/icons/64.png", "size": "64x64", "type": "image/png" }, { - "src": "/assets/icon/128.png", + "src": "/assets/icons/128.png", "size": "128x128", "type": "image/png" }, { - "src": "/assets/icon/192.png", + "src": "/assets/icons/192.png", "size": "192x192", "type": "image/png" }, { - "src": "/assets/icon/256.png", + "src": "/assets/icons/256.png", "size": "256x256", "type": "image/png" } -- cgit v1.2.3-freya From 5a13964ced63ceda982a3ba17b675478bac902a9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 18 Jun 2018 16:34:26 +0900 Subject: Fix bug --- src/server/web/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/web/index.ts b/src/server/web/index.ts index 050fc3c76c..4400fc1024 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -49,7 +49,7 @@ const router = new Router(); //#region static assets router.get('/assets/*', async ctx => { - await send(ctx, path, { + await send(ctx, ctx.path, { root: client, maxage: ms('7 days'), immutable: true -- cgit v1.2.3-freya From c3312c918e6b52834eadae43c3f1e2c174d750de Mon Sep 17 00:00:00 2001 From: tosuke Date: Mon, 18 Jun 2018 16:44:42 +0900 Subject: replace "size" to "sizes" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit やらかした --- src/client/assets/manifest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json index 540d220aad..dcd1e26790 100644 --- a/src/client/assets/manifest.json +++ b/src/client/assets/manifest.json @@ -7,32 +7,32 @@ "icons": [ { "src": "/assets/icons/16.png", - "size": "16x16", + "sizes": "16x16", "type": "image/png" }, { "src": "/assets/icons/32.png", - "size": "32x32", + "sizes": "32x32", "type": "image/png" }, { "src": "/assets/icons/64.png", - "size": "64x64", + "sizes": "64x64", "type": "image/png" }, { "src": "/assets/icons/128.png", - "size": "128x128", + "sizes": "128x128", "type": "image/png" }, { "src": "/assets/icons/192.png", - "size": "192x192", + "sizes": "192x192", "type": "image/png" }, { "src": "/assets/icons/256.png", - "size": "256x256", + "sizes": "256x256", "type": "image/png" } ], -- cgit v1.2.3-freya From 1496fdaf8041f981fba0091c1d2eca6df8d88253 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 18 Jun 2018 17:25:20 +0900 Subject: nanka --- locales/en.yml | 1 + locales/ja.yml | 1 + src/client/app/common/views/components/reaction-icon.vue | 5 ++++- src/client/app/desktop/views/components/settings.vue | 7 +++++++ src/client/app/desktop/views/pages/welcome.vue | 2 +- src/client/app/mobile/views/pages/settings.vue | 8 ++++++++ src/client/app/store.ts | 3 ++- src/client/assets/reactions/sushi.png | Bin 0 -> 8651 bytes 8 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 src/client/assets/reactions/sushi.png diff --git a/locales/en.yml b/locales/en.yml index 8b54a6616e..778d54076c 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -47,6 +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 rather than pudding" widgets: analog-clock: "Analog clock" profile: "Profile" diff --git a/locales/ja.yml b/locales/ja.yml index 29decefe68..f2a85eb4e6 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/src/client/app/common/views/components/reaction-icon.vue b/src/client/app/common/views/components/reaction-icon.vue index 7d24f4f9e9..2d5391a21e 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 c660c2869a..536d270dce 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 70fa0123af..029e44e27c 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%