Merge branch 'master' into hybrid-tl

src/client/app/common/scripts/streaming/games/reversi/reversi-game.ts

@@ -1,5 +1,5 @@
-import Stream from '../stream';
-import MiOS from '../../../../mios';
+import Stream from '../../stream';
+import MiOS from '../../../../../mios';
 
 export class ReversiGameStream extends Stream {
 	constructor(os: MiOS, me, game) {

src/client/app/common/scripts/streaming/games/reversi/reversi.ts

@@ -1,6 +1,6 @@
-import StreamManager from '../stream-manager';
-import Stream from '../stream';
-import MiOS from '../../../../mios';
+import StreamManager from '../../stream-manager';
+import Stream from '../../stream';
+import MiOS from '../../../../../mios';
 
 export class ReversiStream extends Stream {
 	constructor(os: MiOS, me) {

src/client/app/common/views/components/games/reversi/reversi.game.vue

@@ -58,8 +58,8 @@
 <script lang="ts">
 import Vue from 'vue';
 import * as CRC32 from 'crc-32';
-import Reversi, { Color } from '../../../../../games/reversi/core';
-import { url } from '../../../config';
+import Reversi, { Color } from '../../../../../../../games/reversi/core';
+import { url } from '../../../../../config';
 
 export default Vue.extend({
 	props: ['initGame', 'connection'],

src/client/app/common/views/components/games/reversi/reversi.gameroom.vue

@@ -9,7 +9,7 @@
 import Vue from 'vue';
 import XGame from './reversi.game.vue';
 import XRoom from './reversi.room.vue';
-import { ReversiGameStream } from '../../scripts/streaming/reversi-game';
+import { ReversiGameStream } from '../../../../scripts/streaming/games/reversi-game';
 
 export default Vue.extend({
 	components: {

src/client/app/common/views/components/games/reversi/reversi.room.vue

@@ -94,7 +94,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import * as maps from '../../../../../games/reversi/maps';
+import * as maps from '../../../../../../../games/reversi/maps';
 
 export default Vue.extend({
 	props: ['game', 'connection'],

src/client/app/common/views/components/index.ts

@@ -27,7 +27,7 @@ import urlPreview from './url-preview.vue';
 import twitterSetting from './twitter-setting.vue';
 import fileTypeIcon from './file-type-icon.vue';
 import Switch from './switch.vue';
-import Reversi from './reversi.vue';
+import Reversi from './games/reversi/reversi.vue';
 import welcomeTimeline from './welcome-timeline.vue';
 import uiInput from './ui/input.vue';
 import uiButton from './ui/button.vue';

src/client/app/common/views/components/messaging-room.message.vue

@@ -22,7 +22,7 @@
 		<div></div>
 		<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
 		<footer>
-			<span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</p>
+			<span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</span>
 			<mk-time :time="message.createdAt"/>
 			<template v-if="message.is_edited">%fa:pencil-alt%</template>
 		</footer>

src/client/app/mios.ts

@@ -11,7 +11,7 @@ import { DriveStreamManager } from './common/scripts/streaming/drive';
 import { ServerStatsStreamManager } from './common/scripts/streaming/server-stats';
 import { NotesStatsStreamManager } from './common/scripts/streaming/notes-stats';
 import { MessagingIndexStreamManager } from './common/scripts/streaming/messaging-index';
-import { ReversiStreamManager } from './common/scripts/streaming/games/reversi';
+import { ReversiStreamManager } from './common/scripts/streaming/games/reversi/reversi';
 
 import Err from './common/views/components/connect-failed.vue';
 import { LocalTimelineStreamManager } from './common/scripts/streaming/local-timeline';