From 925f89720aabfbf09eedbe6ace524c78f9e8e42d Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Mon, 8 Jul 2019 17:02:58 +0900 Subject: [PATCH 1/9] New translations ja-JP.yml (Korean) (#5121) --- locales/ko-KR.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index a24ee94200..17f0009bbe 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -123,6 +123,7 @@ common: add-visible-user: "사용자 추가" cw-placeholder: "내용에 대한 주석 (옵션)" username-prompt: "사용자명을 입력해주세요" + enter-file-name: "파일 이름 수정" weekday-short: sunday: "일" monday: "월" @@ -189,6 +190,11 @@ common: remember-note-visibility: "글의 공개 범위를 기억하기" web-search-engine: "웹 검색엔진" web-search-engine-desc: "예: https://www.google.com/?#q={{query}}" + paste: "붙여넣기" + pasted-file-name: "붙여넣은 파일의 이름 템플릿" + pasted-file-name-desc: "예시: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\"" + paste-dialog: "붙여넣기 시 파일 이름을 편집" + paste-dialog-desc: "붙여넣기 시 파일 이름을 편집할 수 있도록 대화 상자를 표시합니다." keep-cw: "CW 유지" keep-cw-desc: "글에 답글을 달 때, 답글할 글에 CW가 설정되어 있는 경우 기본값으로 동일한 CW를 설정하도록 합니다." i-like-sushi: "저는 (푸딩보다 차라리) 초밥이 좋아요" From 4478298a0a1db41b234c4bef3611d8a3256bc653 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Tue, 9 Jul 2019 00:11:04 +0900 Subject: [PATCH 2/9] Update uodate docs --- CHANGELOG.md | 12 ------------ docs/setup.en.md | 2 +- docs/setup.fr.md | 2 +- docs/setup.ja.md | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 732475db37..6ab5ae5fd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,18 +5,6 @@ If you encounter any problems with updating, please try the following: 1. `npm run clean` or `npm run cleanall` 2. Retry update (Don't forget `npm i`) -Migration ------------------------------- -#### 1 -``` -npm i -g ts-node -``` - -#### 2 -``` -npm run migrate -``` - 11.25.0 (2019/07/08) -------------------- ### ✨Improvements diff --git a/docs/setup.en.md b/docs/setup.en.md index b38ef64a02..3020380037 100644 --- a/docs/setup.en.md +++ b/docs/setup.en.md @@ -132,7 +132,7 @@ You can check if the service is running with `systemctl status misskey`. 2. `git pull` 3. `npm install` 4. `NODE_ENV=production npm run build` -5. Check [ChangeLog](../CHANGELOG.md) for migration information +5. `npm run migrate` 6. Restart your Misskey process to apply changes 7. Enjoy diff --git a/docs/setup.fr.md b/docs/setup.fr.md index 7ab88a6cde..09ab305b43 100644 --- a/docs/setup.fr.md +++ b/docs/setup.fr.md @@ -126,7 +126,7 @@ Vous pouvez vérifier si le service a démarré en utilisant la commande `system 2. `git pull` 3. `npm install` 4. `NODE_ENV=production npm run build` -5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration. +5. `npm run migrate` ---------------------------------------------------------------- diff --git a/docs/setup.ja.md b/docs/setup.ja.md index fcbef2af13..e8a11de69b 100644 --- a/docs/setup.ja.md +++ b/docs/setup.ja.md @@ -133,7 +133,7 @@ npm run init 2. `git pull` 3. `npm install` 4. `NODE_ENV=production npm run build` -5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する +5. `npm run migrate` なにか問題が発生した場合は、`npm run clean`または`npm run cleanall`すると直る場合があります。 From 2465a377a1ed4cb0904c088c95076c28c9cf92a2 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Tue, 9 Jul 2019 04:09:02 +0900 Subject: [PATCH 3/9] Delete init.ts --- src/init.ts | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 src/init.ts diff --git a/src/init.ts b/src/init.ts deleted file mode 100644 index 2fe16a7069..0000000000 --- a/src/init.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { initDb } from './db/postgre'; - -console.log('Init database...'); - -initDb(false, true, true).then(() => { - console.log('Done :)'); - process.exit(0); -}, e => { - console.error('Failed to init database'); - console.error(e); -}); From 2f451fa05883e60a6b2b2963d71f103e7c86265f Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Tue, 9 Jul 2019 09:53:24 +0900 Subject: [PATCH 4/9] New translations ja-JP.yml (English) (#5123) --- locales/en-US.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/en-US.yml b/locales/en-US.yml index 0be3c1b293..1077f563bc 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -191,7 +191,10 @@ common: web-search-engine: "Web search engine" web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}" paste: "Paste" + pasted-file-name: "Template for pasted file name" + pasted-file-name-desc: "Example: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\"" paste-dialog: "Edit the pasted file name" + paste-dialog-desc: "Display the dialog to edit the file name when you pasting file." keep-cw: "Preserve content warning" keep-cw-desc: "When replying to a post, the same content warning is set by default to the reply, as has been set by the original post." i-like-sushi: "I prefer sushi rather than pudding" From 0eb84fe8745fb3aa4c5387a99d0dbf3174f45b75 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Tue, 9 Jul 2019 16:55:33 +0900 Subject: [PATCH 5/9] Fix bug --- src/server/api/endpoints/page-push.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/api/endpoints/page-push.ts b/src/server/api/endpoints/page-push.ts index f5e1a4d1eb..3af9ff50f4 100644 --- a/src/server/api/endpoints/page-push.ts +++ b/src/server/api/endpoints/page-push.ts @@ -38,7 +38,7 @@ export default define(meta, async (ps, user) => { throw new ApiError(meta.errors.noSuchPage); } - publishMainStream(user.id, 'pageEvent', { + publishMainStream(page.userId, 'pageEvent', { pageId: ps.pageId, event: ps.event, var: ps.var, From a7aa9249493e2611c359ae49987da050f7abd09f Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Tue, 9 Jul 2019 16:55:55 +0900 Subject: [PATCH 6/9] Add userId prop --- src/server/api/endpoints/page-push.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/api/endpoints/page-push.ts b/src/server/api/endpoints/page-push.ts index 3af9ff50f4..bdd2ebfe51 100644 --- a/src/server/api/endpoints/page-push.ts +++ b/src/server/api/endpoints/page-push.ts @@ -42,6 +42,7 @@ export default define(meta, async (ps, user) => { pageId: ps.pageId, event: ps.event, var: ps.var, + userId: user.id, user: await Users.pack(user, page.userId, { detail: true }) From 24e389bcf3768cb373683b614950077f92a2b72a Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue, 9 Jul 2019 17:01:08 +0900 Subject: [PATCH 7/9] Tune font (#5125) --- .../app/common/views/components/google.vue | 1 - .../app/common/views/components/page/page.vue | 6 +++- .../app/desktop/views/components/drive.vue | 31 ------------------- .../views/components/ui.header.account.vue | 1 - src/client/app/init.css | 2 +- src/client/app/reset.styl | 2 +- src/client/style.styl | 2 +- src/server/web/views/info.pug | 2 +- 8 files changed, 9 insertions(+), 38 deletions(-) diff --git a/src/client/app/common/views/components/google.vue b/src/client/app/common/views/components/google.vue index dab2e6824a..1e88147399 100644 --- a/src/client/app/common/views/components/google.vue +++ b/src/client/app/common/views/components/google.vue @@ -41,7 +41,6 @@ export default Vue.extend({ padding 10px width 100% height 40px - font-family sans-serif font-size 16px color var(--googleSearchFg) background var(--googleSearchBg) diff --git a/src/client/app/common/views/components/page/page.vue b/src/client/app/common/views/components/page/page.vue index 99e627fd89..1bfb93780f 100644 --- a/src/client/app/common/views/components/page/page.vue +++ b/src/client/app/common/views/components/page/page.vue @@ -1,5 +1,5 @@ <template> -<div class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter }" :style="{ fontFamily: page.font }"> +<div class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter, serif: page.font === 'serif' }"> <header v-if="showTitle"> <div class="title">{{ page.title }}</div> </header> @@ -150,6 +150,10 @@ export default Vue.extend({ .iroscrza overflow hidden background var(--face) + + &.serif + > div + font-family serif &.center text-align center diff --git a/src/client/app/desktop/views/components/drive.vue b/src/client/app/desktop/views/components/drive.vue index 2eb9581359..a78c0040c3 100644 --- a/src/client/app/desktop/views/components/drive.vue +++ b/src/client/app/desktop/views/components/drive.vue @@ -10,10 +10,6 @@ <span class="separator" v-if="folder != null"><fa icon="angle-right"/></span> <span class="folder current" v-if="folder != null">{{ folder.name }}</span> </div> - <!-- - TODO: #343 - <input class="search" type="search" placeholder=" %i18n:@search%"/> - --> </nav> <div class="main" :class="{ uploading: uploadings.length > 0, fetching }" ref="main" @@ -647,33 +643,6 @@ export default Vue.extend({ > [data-icon] margin 0 - > .search - display inline-block - vertical-align bottom - user-select text - cursor auto - margin 0 - padding 0 18px - width 200px - font-size 1em - line-height 38px - background transparent - outline none - //border solid 1px #ddd - border none - border-radius 0 - box-shadow none - transition color 0.5s ease, border 0.5s ease - font-family FontAwesome, sans-serif - - &[data-active='true'] - background #fff - - &::-webkit-input-placeholder, - &:-ms-input-placeholder, - &:-moz-placeholder - color $ui-control-foreground-color - > .main padding 8px height calc(100% - 38px) diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue index c00c6b9c64..5d7ed8c302 100644 --- a/src/client/app/desktop/views/components/ui.header.account.vue +++ b/src/client/app/desktop/views/components/ui.header.account.vue @@ -197,7 +197,6 @@ export default Vue.extend({ max-width 16em line-height 48px font-weight bold - font-family Meiryo, sans-serif text-decoration none @media (max-width 1100px) diff --git a/src/client/app/init.css b/src/client/app/init.css index cd86b654c3..db5e23c56d 100644 --- a/src/client/app/init.css +++ b/src/client/app/init.css @@ -5,7 +5,7 @@ */ html { - font-family: sans-serif; + font-family: Roboto, HelveticaNeue, Arial, sans-serif; } body > noscript { diff --git a/src/client/app/reset.styl b/src/client/app/reset.styl index 8128f1ed23..ce49afb161 100644 --- a/src/client/app/reset.styl +++ b/src/client/app/reset.styl @@ -15,7 +15,7 @@ progress box-shadow none textarea - font-family sans-serif + font-family Roboto, HelveticaNeue, Arial, sans-serif button margin 0 diff --git a/src/client/style.styl b/src/client/style.styl index 968e66e754..9638ea5305 100644 --- a/src/client/style.styl +++ b/src/client/style.styl @@ -18,7 +18,7 @@ html, body padding 0 scroll-behavior smooth text-size-adjust 100% - font-family sans-serif + font-family Roboto, HelveticaNeue, Arial, sans-serif html.changing-theme &, * diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug index fc71e5c193..992e652a60 100644 --- a/src/server/web/views/info.pug +++ b/src/server/web/views/info.pug @@ -8,7 +8,7 @@ html title Misskey style. html { - font-family: sans-serif; + font-family: Roboto, HelveticaNeue, Arial, sans-serif; } main { From 405c9c258b8c1fe4b06af5a46e187a1d92dec76e Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Tue, 9 Jul 2019 17:01:28 +0900 Subject: [PATCH 8/9] New translations ja-JP.yml (English) (#5126) --- locales/en-US.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 1077f563bc..c53700b4e5 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -194,7 +194,7 @@ common: pasted-file-name: "Template for pasted file name" pasted-file-name-desc: "Example: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\"" paste-dialog: "Edit the pasted file name" - paste-dialog-desc: "Display the dialog to edit the file name when you pasting file." + paste-dialog-desc: "Display a dialog to edit the file name when you paste a file." keep-cw: "Preserve content warning" keep-cw-desc: "When replying to a post, the same content warning is set by default to the reply, as has been set by the original post." i-like-sushi: "I prefer sushi rather than pudding" From 3e516474c22579abc595f4657d54e16a0064cd88 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Tue, 9 Jul 2019 17:03:24 +0900 Subject: [PATCH 9/9] 11.25.1 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ab5ae5fd0..951a0fd94f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ If you encounter any problems with updating, please try the following: 1. `npm run clean` or `npm run cleanall` 2. Retry update (Don't forget `npm i`) +11.25.1 (2019/07/09) +-------------------- +### 🐛Fixes +* ページイベントが正しくストリームに流れてこない問題を修正 +* フォントの調整 + 11.25.0 (2019/07/08) -------------------- ### ✨Improvements diff --git a/package.json b/package.json index 3a0a73990f..f08364f2bf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo <i@syuilo.com>", - "version": "11.25.0", + "version": "11.25.1", "codename": "daybreak", "repository": { "type": "git",