diff --git a/CHANGELOG.md b/CHANGELOG.md index 732475db37..951a0fd94f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,17 +5,11 @@ 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.1 (2019/07/09) +-------------------- +### ๐Ÿ›Fixes +* ใƒšใƒผใ‚ธใ‚คใƒ™ใƒณใƒˆใŒๆญฃใ—ใใ‚นใƒˆใƒชใƒผใƒ ใซๆตใ‚Œใฆใ“ใชใ„ๅ•้กŒใ‚’ไฟฎๆญฃ +* ใƒ•ใ‚ฉใƒณใƒˆใฎ่ชฟๆ•ด 11.25.0 (2019/07/08) -------------------- 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`ใ™ใ‚‹ใจ็›ดใ‚‹ๅ ดๅˆใŒใ‚ใ‚Šใพใ™ใ€‚ diff --git a/locales/en-US.yml b/locales/en-US.yml index 0be3c1b293..c53700b4e5 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 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" 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: "์ €๋Š” (ํ‘ธ๋”ฉ๋ณด๋‹ค ์ฐจ๋ผ๋ฆฌ) ์ดˆ๋ฐฅ์ด ์ข‹์•„์š”" 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 ", - "version": "11.25.0", + "version": "11.25.1", "codename": "daybreak", "repository": { "type": "git", 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 @@