From bfc193d8cd9aecdb82d585e8b4e101deac60a5bb Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 29 Mar 2018 14:48:47 +0900 Subject: Resolve conflicts --- src/server/web/app/auth/views/form.vue | 2 +- src/server/web/app/auth/views/index.vue | 12 ++--- src/server/web/app/ch/tags/channel.tag | 28 +++++------ src/server/web/app/common/define-widget.ts | 4 +- src/server/web/app/common/mios.ts | 4 +- .../web/app/common/scripts/compose-notification.ts | 12 ++--- .../web/app/common/scripts/parse-search-query.ts | 4 +- .../web/app/common/scripts/streaming/home.ts | 2 +- .../app/common/views/components/autocomplete.vue | 2 +- .../views/components/messaging-room.form.vue | 6 +-- .../views/components/messaging-room.message.vue | 12 ++--- .../app/common/views/components/messaging-room.vue | 16 +++--- .../web/app/common/views/components/messaging.vue | 16 +++--- .../app/common/views/components/othello.game.vue | 58 +++++++++++----------- .../common/views/components/othello.gameroom.vue | 2 +- .../app/common/views/components/othello.room.vue | 26 +++++----- .../web/app/common/views/components/othello.vue | 22 ++++---- .../web/app/common/views/components/poll.vue | 10 ++-- .../web/app/common/views/components/post-menu.vue | 4 +- .../common/views/components/reaction-picker.vue | 2 +- .../common/views/components/reactions-viewer.vue | 2 +- .../web/app/common/views/components/signin.vue | 6 +-- .../web/app/common/views/components/signup.vue | 2 +- .../common/views/components/twitter-setting.vue | 4 +- .../web/app/common/views/components/uploader.vue | 2 +- .../common/views/components/welcome-timeline.vue | 4 +- .../app/common/views/directives/autocomplete.ts | 2 +- .../web/app/common/views/widgets/slideshow.vue | 2 +- .../web/app/common/views/widgets/version.vue | 7 +-- src/server/web/app/config.ts | 4 +- src/server/web/app/desktop/api/update-avatar.ts | 8 +-- src/server/web/app/desktop/api/update-banner.ts | 8 +-- .../web/app/desktop/views/components/activity.vue | 2 +- .../app/desktop/views/components/drive.file.vue | 14 +++--- .../app/desktop/views/components/drive.folder.vue | 10 ++-- .../desktop/views/components/drive.nav-folder.vue | 8 +-- .../web/app/desktop/views/components/drive.vue | 28 +++++------ .../app/desktop/views/components/follow-button.vue | 22 ++++---- .../desktop/views/components/followers-window.vue | 2 +- .../web/app/desktop/views/components/followers.vue | 6 +-- .../desktop/views/components/following-window.vue | 2 +- .../web/app/desktop/views/components/following.vue | 6 +-- .../app/desktop/views/components/friends-maker.vue | 2 +- .../web/app/desktop/views/components/home.vue | 20 ++++---- .../app/desktop/views/components/media-image.vue | 2 +- .../web/app/desktop/views/components/mentions.vue | 2 +- .../app/desktop/views/components/notifications.vue | 38 +++++++------- .../desktop/views/components/post-detail.sub.vue | 8 +-- .../app/desktop/views/components/post-detail.vue | 32 ++++++------ .../web/app/desktop/views/components/post-form.vue | 8 +-- .../app/desktop/views/components/post-preview.vue | 8 +-- .../desktop/views/components/posts.post.sub.vue | 8 +-- .../app/desktop/views/components/posts.post.vue | 36 +++++++------- .../web/app/desktop/views/components/posts.vue | 4 +- .../app/desktop/views/components/repost-form.vue | 2 +- .../app/desktop/views/components/settings.2fa.vue | 8 +-- .../desktop/views/components/settings.password.vue | 4 +- .../desktop/views/components/settings.profile.vue | 6 +-- .../desktop/views/components/settings.signins.vue | 2 +- .../web/app/desktop/views/components/settings.vue | 14 +++--- .../desktop/views/components/sub-post-content.vue | 4 +- .../web/app/desktop/views/components/timeline.vue | 8 +-- .../desktop/views/components/ui.header.account.vue | 2 +- .../web/app/desktop/views/components/ui.header.vue | 4 +- .../app/desktop/views/components/user-preview.vue | 12 ++--- .../desktop/views/components/users-list.item.vue | 4 +- .../desktop/views/components/widget-container.vue | 4 +- .../web/app/desktop/views/components/window.vue | 4 +- src/server/web/app/desktop/views/pages/home.vue | 2 +- src/server/web/app/desktop/views/pages/othello.vue | 2 +- src/server/web/app/desktop/views/pages/post.vue | 2 +- .../views/pages/user/user.followers-you-know.vue | 4 +- .../app/desktop/views/pages/user/user.friends.vue | 4 +- .../app/desktop/views/pages/user/user.header.vue | 10 ++-- .../web/app/desktop/views/pages/user/user.home.vue | 6 +-- .../app/desktop/views/pages/user/user.photos.vue | 4 +- .../app/desktop/views/pages/user/user.profile.vue | 22 ++++---- .../app/desktop/views/pages/user/user.timeline.vue | 8 +-- src/server/web/app/desktop/views/pages/welcome.vue | 2 +- .../desktop/views/widgets/channel.channel.form.vue | 4 +- .../app/desktop/views/widgets/channel.channel.vue | 2 +- .../web/app/desktop/views/widgets/channel.vue | 2 +- .../web/app/desktop/views/widgets/profile.vue | 4 +- src/server/web/app/desktop/views/widgets/users.vue | 2 +- src/server/web/app/dev/views/app.vue | 2 +- src/server/web/app/dev/views/new-app.vue | 12 ++--- src/server/web/app/init.ts | 4 +- src/server/web/app/mobile/api/post.ts | 2 +- .../web/app/mobile/views/components/activity.vue | 2 +- .../mobile/views/components/drive.file-detail.vue | 14 +++--- .../web/app/mobile/views/components/drive.file.vue | 4 +- .../web/app/mobile/views/components/drive.vue | 38 +++++++------- .../app/mobile/views/components/follow-button.vue | 22 ++++---- .../app/mobile/views/components/media-image.vue | 2 +- .../views/components/notification-preview.vue | 14 +++--- .../app/mobile/views/components/notification.vue | 16 +++--- .../app/mobile/views/components/notifications.vue | 6 +-- .../web/app/mobile/views/components/post-card.vue | 2 +- .../mobile/views/components/post-detail.sub.vue | 4 +- .../app/mobile/views/components/post-detail.vue | 28 +++++------ .../web/app/mobile/views/components/post-form.vue | 8 +-- .../app/mobile/views/components/post-preview.vue | 4 +- .../web/app/mobile/views/components/post.sub.vue | 4 +- .../web/app/mobile/views/components/post.vue | 30 +++++------ .../web/app/mobile/views/components/posts.vue | 4 +- .../mobile/views/components/sub-post-content.vue | 4 +- .../web/app/mobile/views/components/timeline.vue | 6 +-- .../web/app/mobile/views/components/ui.header.vue | 4 +- .../web/app/mobile/views/components/ui.nav.vue | 2 +- .../web/app/mobile/views/components/user-card.vue | 4 +- .../app/mobile/views/components/user-preview.vue | 2 +- .../app/mobile/views/components/user-timeline.vue | 10 ++-- .../web/app/mobile/views/pages/followers.vue | 8 +-- .../web/app/mobile/views/pages/following.vue | 8 +-- src/server/web/app/mobile/views/pages/home.vue | 22 ++++---- .../web/app/mobile/views/pages/notifications.vue | 2 +- src/server/web/app/mobile/views/pages/othello.vue | 2 +- src/server/web/app/mobile/views/pages/post.vue | 2 +- .../web/app/mobile/views/pages/profile-setting.vue | 8 +-- src/server/web/app/mobile/views/pages/settings.vue | 7 +-- src/server/web/app/mobile/views/pages/user.vue | 12 ++--- .../views/pages/user/home.followers-you-know.vue | 4 +- .../app/mobile/views/pages/user/home.friends.vue | 2 +- .../app/mobile/views/pages/user/home.photos.vue | 4 +- .../web/app/mobile/views/pages/user/home.posts.vue | 2 +- .../web/app/mobile/views/pages/user/home.vue | 4 +- src/server/web/app/mobile/views/pages/welcome.vue | 8 +-- .../web/app/mobile/views/widgets/profile.vue | 4 +- src/server/web/app/stats/tags/index.tag | 4 +- 129 files changed, 540 insertions(+), 538 deletions(-) (limited to 'src/server/web/app') diff --git a/src/server/web/app/auth/views/form.vue b/src/server/web/app/auth/views/form.vue index d86ed58b38..9d9e8cdb1b 100644 --- a/src/server/web/app/auth/views/form.vue +++ b/src/server/web/app/auth/views/form.vue @@ -7,7 +7,7 @@

{{ app.name }}

-

{{ app.name_id }}

+

{{ app.nameId }}

{{ app.description }}

diff --git a/src/server/web/app/auth/views/index.vue b/src/server/web/app/auth/views/index.vue index 17e5cc6108..e1e1b265e1 100644 --- a/src/server/web/app/auth/views/index.vue +++ b/src/server/web/app/auth/views/index.vue @@ -14,9 +14,9 @@

このアプリがあなたのアカウントにアクセスすることはありません。

-

{{ session.app.is_authorized ? 'このアプリは既に連携済みです' : 'アプリケーションの連携を許可しました'}}

-

アプリケーションに戻っています

-

アプリケーションに戻って、やっていってください。

+

{{ session.app.isAuthorized ? 'このアプリは既に連携済みです' : 'アプリケーションの連携を許可しました' }}

+

アプリケーションに戻っています

+

アプリケーションに戻って、やっていってください。

セッションが存在しません。

@@ -61,7 +61,7 @@ export default Vue.extend({ this.fetching = false; // 既に連携していた場合 - if (this.session.app.is_authorized) { + if (this.session.app.isAuthorized) { this.$root.$data.os.api('auth/accept', { token: this.session.token }).then(() => { @@ -77,8 +77,8 @@ export default Vue.extend({ methods: { accepted() { this.state = 'accepted'; - if (this.session.app.callback_url) { - location.href = this.session.app.callback_url + '?token=' + this.session.token; + if (this.session.app.callbackUrl) { + location.href = this.session.app.callbackUrl + '?token=' + this.session.token; } } } diff --git a/src/server/web/app/ch/tags/channel.tag b/src/server/web/app/ch/tags/channel.tag index dc4b8e1426..2abfb106a5 100644 --- a/src/server/web/app/ch/tags/channel.tag +++ b/src/server/web/app/ch/tags/channel.tag @@ -5,8 +5,8 @@

{ channel.title }

-

このチャンネルをウォッチしています ウォッチ解除

-

このチャンネルをウォッチする

+

このチャンネルをウォッチしています ウォッチ解除

+

このチャンネルをウォッチする