Merge branch 'develop'

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
+11.25.1 (2019/07/09)
-------------------------------
+--------------------
-#### 1
+### 🐛Fixes
-```
+* ページイベントが正しくストリームに流れてこない問題を修正
-npm i -g ts-node
+* フォントの調整
-```
-
-#### 2
-```
-npm run migrate
-```
 
 11.25.0 (2019/07/08)
 --------------------

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
 

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`
 
 ----------------------------------------------------------------
 

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`すると直る場合があります。
 

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"

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: "저는 (푸딩보다 차라리) 초밥이 좋아요"

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",

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)

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

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="&#xf002; %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)

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)

src/client/app/init.css

@@ -5,7 +5,7 @@
  */
 
 html {
-	font-family: sans-serif;
+	font-family: Roboto, HelveticaNeue, Arial, sans-serif;
 }
 
 body > noscript {

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

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
 	&, *

src/init.ts

@@ -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);
-});

src/server/api/endpoints/page-push.ts

@@ -38,10 +38,11 @@ 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,
+		userId: user.id,
 		user: await Users.pack(user, page.userId, {
 			detail: true
 		})

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 {