From a9ed2b48dc4b3ca2b4c548179955496f9a1c1bdc Mon Sep 17 00:00:00 2001 From: Xeltica <7106976+Xeltica@users.noreply.github.com> Date: Tue, 24 Mar 2020 21:12:24 +0900 Subject: [PATCH 01/14] Update CHANGELOG.md --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e7e2d2b9..979cd1c6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ ChangeLog ========= +12.25.0 (2020/03/24) +------------------- + +### ✨Improvements +* テーマインポート機能を実装 + +### 🐛Fixes +* 誰もフォローしていないときにタイムラインの読み込みが遅い問題を修正 + + 12.24.2 (2020/03/22) ------------------- From 25494f5c9a1a54583861c1a72e48f6ccc6916813 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 14:54:34 +0900 Subject: [PATCH 02/14] Update icon :art: --- assets/apple-touch-icon.png | 4 ++-- assets/favicon.png | 4 ++-- assets/icon.afdesign | 3 --- assets/icon.svg | 4 ++-- assets/icons/192.png | 4 ++-- assets/icons/512.png | 4 ++-- 6 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 assets/icon.afdesign diff --git a/assets/apple-touch-icon.png b/assets/apple-touch-icon.png index 2527d0789..cdd486d62 100644 --- a/assets/apple-touch-icon.png +++ b/assets/apple-touch-icon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2846697f5482088d926a829f1f7b7f4f5eb55d37ada7e3967d6c51a59d865e5e -size 15094 +oid sha256:fe3c09580d51464332de241e85e65224585d44d4c673e387ac56eecdff85c91b +size 10277 diff --git a/assets/favicon.png b/assets/favicon.png index 46b8a83bc..1bdbf789a 100644 --- a/assets/favicon.png +++ b/assets/favicon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a35d4cc54eee0dfaa3c4bd746d408fb487c378dc849c4b08826919274b8e040b -size 11045 +oid sha256:4b2e31b5371b310ee3f25b69e6df17bc26ffd41f84655dfd2834384e13ee2ccc +size 6262 diff --git a/assets/icon.afdesign b/assets/icon.afdesign deleted file mode 100644 index e2d18cb0e..000000000 --- a/assets/icon.afdesign +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d64de24e29464445bb205defc55a4c9e343e26f87ebc3f60381c9c73799f7a0f -size 63730 diff --git a/assets/icon.svg b/assets/icon.svg index 0869bd727..bed89706a 100644 --- a/assets/icon.svg +++ b/assets/icon.svg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca315bec303221ae7c7f28cd6119f8c15e6c10f4125d39aa455a60ccbfba1dd2 -size 3076 +oid sha256:0c49fc617c39a4c165b1f41837e5d87388990e74ea3b5df0db129a12a7018a81 +size 4324 diff --git a/assets/icons/192.png b/assets/icons/192.png index 941e493b0..38125c513 100644 --- a/assets/icons/192.png +++ b/assets/icons/192.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:089b8d581a61f5fa72dbc165011b364d375c0af44dfee8b4220ada92d56c203a -size 9986 +oid sha256:8e003966d5b136e4cc4e0126e6900f17541969d41180f5a3f7c52a74a281f4bf +size 8012 diff --git a/assets/icons/512.png b/assets/icons/512.png index b20136ebd..dd72f40af 100644 --- a/assets/icons/512.png +++ b/assets/icons/512.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fb6908adbdf2890bf7491bbf5a05fe0f7b85c8188690fc707c0568c10a8b245 -size 48032 +oid sha256:2c69e2cdc1fea20e197ce19293229a6d2b8f63703d9b52c7d58918a153921db0 +size 19972 From 00ee61d57819532f19ceb77f8d5a6ebffa439b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=8C=E9=A2=A8=E3=83=89=E3=83=AC=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=B3=E3=82=B0?= <37681609+CookieRamen@users.noreply.github.com> Date: Wed, 25 Mar 2020 15:57:35 +0900 Subject: [PATCH 03/14] Fix #6176 (#6183) --- src/client/pages/instance/users.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/client/pages/instance/users.vue b/src/client/pages/instance/users.vue index 2341c5198..db9e625e4 100644 --- a/src/client/pages/instance/users.vue +++ b/src/client/pages/instance/users.vue @@ -64,6 +64,9 @@ export default Vue.extend({ pagination: { endpoint: 'admin/show-users', limit: 10, + params: () => ({ + sort: '+createdAt' + }), offsetMode: true }, target: '', From 721bf527478c711c44ef97243af808b166da78b7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 19:10:41 +0900 Subject: [PATCH 04/14] Adjust icon size :art: --- assets/apple-touch-icon.png | 4 ++-- assets/icons/192.png | 4 ++-- assets/icons/512.png | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/apple-touch-icon.png b/assets/apple-touch-icon.png index cdd486d62..2ddc4e301 100644 --- a/assets/apple-touch-icon.png +++ b/assets/apple-touch-icon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe3c09580d51464332de241e85e65224585d44d4c673e387ac56eecdff85c91b -size 10277 +oid sha256:fa74d09e2d42320042239fcff96e8919748bd214d1d81b8443686ecc685f9bd9 +size 11897 diff --git a/assets/icons/192.png b/assets/icons/192.png index 38125c513..221261792 100644 --- a/assets/icons/192.png +++ b/assets/icons/192.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e003966d5b136e4cc4e0126e6900f17541969d41180f5a3f7c52a74a281f4bf -size 8012 +oid sha256:c1d3dd8e787f6feddbe9867f8cc6380bd78afda6912fde95df2bfff7dc308d63 +size 9197 diff --git a/assets/icons/512.png b/assets/icons/512.png index dd72f40af..351092f26 100644 --- a/assets/icons/512.png +++ b/assets/icons/512.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c69e2cdc1fea20e197ce19293229a6d2b8f63703d9b52c7d58918a153921db0 -size 19972 +oid sha256:3e01458f557ee98f613276c1aa630383422df067ee303ad3b4ee5689df0bf640 +size 24019 From 7725b600eabb1168ee44c80e377b45bf7f0bb77a Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 19:15:34 +0900 Subject: [PATCH 05/14] Update icon.svg --- assets/icon.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/icon.svg b/assets/icon.svg index bed89706a..ee33aab1a 100644 --- a/assets/icon.svg +++ b/assets/icon.svg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c49fc617c39a4c165b1f41837e5d87388990e74ea3b5df0db129a12a7018a81 -size 4324 +oid sha256:7334d9cfba7deeb1dc9a3caa30e4c567fe57d7122d69e9c8ada364abef5137d9 +size 4326 From 51b01565b601c13ec48410588b58a2c06b46ed69 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 21:19:39 +0900 Subject: [PATCH 06/14] :art: --- assets/apple-touch-icon.png | 4 ++-- assets/icon.svg | 4 ++-- assets/icons/192.png | 4 ++-- assets/icons/512.png | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/apple-touch-icon.png b/assets/apple-touch-icon.png index 2ddc4e301..8bfa8b62a 100644 --- a/assets/apple-touch-icon.png +++ b/assets/apple-touch-icon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa74d09e2d42320042239fcff96e8919748bd214d1d81b8443686ecc685f9bd9 -size 11897 +oid sha256:6c16c082882d9b02bfbe7eea893bf7995b68579cee134db6892fef0b7dc44ed4 +size 14933 diff --git a/assets/icon.svg b/assets/icon.svg index ee33aab1a..6ddd99ad2 100644 --- a/assets/icon.svg +++ b/assets/icon.svg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7334d9cfba7deeb1dc9a3caa30e4c567fe57d7122d69e9c8ada364abef5137d9 -size 4326 +oid sha256:77d05f5dcbdebccd131c2c1c529c55d53c7a359c463159c8a2e702c7fc60cf83 +size 5799 diff --git a/assets/icons/192.png b/assets/icons/192.png index 221261792..79cfc428b 100644 --- a/assets/icons/192.png +++ b/assets/icons/192.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1d3dd8e787f6feddbe9867f8cc6380bd78afda6912fde95df2bfff7dc308d63 -size 9197 +oid sha256:837dadadc550594f3120d27dd433b8b85fd98d9d27104f1a1ecdcbb1eb8d6fb1 +size 11297 diff --git a/assets/icons/512.png b/assets/icons/512.png index 351092f26..afa2340c9 100644 --- a/assets/icons/512.png +++ b/assets/icons/512.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e01458f557ee98f613276c1aa630383422df067ee303ad3b4ee5689df0bf640 -size 24019 +oid sha256:ad7dedeb35bc2d2406ef94aba2697db7ed5baf46c308910b7f619c4418b7c1a7 +size 30364 From 8413786c4d4f8ca4bbaa54027a83e3fcc69c4499 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 21:24:33 +0900 Subject: [PATCH 07/14] Update favicon.png --- assets/favicon.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/favicon.png b/assets/favicon.png index 1bdbf789a..1742cb343 100644 --- a/assets/favicon.png +++ b/assets/favicon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b2e31b5371b310ee3f25b69e6df17bc26ffd41f84655dfd2834384e13ee2ccc -size 6262 +oid sha256:b088f5813e43e937cbf2cfc2d1e8ad78eef681c1b860defcd957ec9561110437 +size 7387 From 65ecfe1976fa2c7d8cc31946f23457397292c48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=8C=E9=A2=A8=E3=83=89=E3=83=AC=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=B3=E3=82=B0?= <37681609+CookieRamen@users.noreply.github.com> Date: Wed, 25 Mar 2020 22:26:50 +0900 Subject: [PATCH 08/14] Fix #5986 (#6184) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix #5986 * Fix #5986 追加修正 --- src/client/components/signup.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/components/signup.vue b/src/client/components/signup.vue index 34765a7a2..9f3ae8db2 100644 --- a/src/client/components/signup.vue +++ b/src/client/components/signup.vue @@ -38,7 +38,7 @@ - {{ $t('tos') }} + {{ $t('tos') }}
From 572ebdc3c2d010c568052048a88bdf1ad0e4e4d5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 22:40:31 +0900 Subject: [PATCH 09/14] New Crowdin translations (#6181) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (English) * New translations ja-JP.yml (English) --- locales/en-US.yml | 24 +++++++++++++++++------- locales/es-ES.yml | 10 ++++++++++ locales/fr-FR.yml | 10 ++++++++++ locales/ko-KR.yml | 10 ++++++++++ locales/zh-CN.yml | 10 ++++++++++ 5 files changed, 57 insertions(+), 7 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index d5a751004..4c2ea21be 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -18,7 +18,7 @@ instance: "Instance" settings: "Settings" profile: "Profile" timeline: "Timeline" -noAccountDescription: "This user has not created their bio yet." +noAccountDescription: "This user has not written their bio yet." login: "Sign In" loggingIn: "Signing In" logout: "Sign Out" @@ -257,7 +257,7 @@ rename: "Rename" avatar: "Avatar" banner: "Banner" nsfw: "NSFW" -disconnectedFromServer: "Connection to the server was inturrupted" +disconnectedFromServer: "Connection to the server was interrupted." reload: "Refresh" doNothing: "Ignore" reloadConfirm: "Would you like to retry?" @@ -331,7 +331,7 @@ userList: "Lists" about: "About" aboutMisskey: "About Misskey" aboutMisskeyText: "Misskey is an open-source software developed by syuilo since 2014." -misskeyMembers: "It is currently developed an maintained by the members listed below:" +misskeyMembers: "It is currently developed and maintained by the members listed below:" misskeySource: "Source code is available here:" misskeyTranslation: "Help us with your contribution to translate Misskey:" misskeyDonate: "Help us to keep improving the software by donating here:" @@ -352,10 +352,10 @@ resetPassword: "Reset password" newPasswordIs: "The new password is \"{password}\"" post: "Post" posted: "Posted!" -autoReloadWhenDisconnected: "Auto reload when disconnected with server" +autoReloadWhenDisconnected: "Auto reload when disconnected from server" autoNoteWatch: "Watch note automatically" autoNoteWatchDescription: "Get notified about the notes which you reactioned or replied." -reduceUiAnimation: "Reduce animations of User Interface" +reduceUiAnimation: "Reduce UI animation" share: "Share" notFound: "Not found" notFoundDescription: "There was no page corresponding to the specified URL." @@ -411,11 +411,11 @@ or: "Or" uiLanguage: "UI display language" groupInvited: "Invited to group" aboutX: "About {x}" -useOsNativeEmojis: "Use the OS native Emojis" +useOsNativeEmojis: "Use OS native Emojis" youHaveNoGroups: "You have no groups" joinOrCreateGroup: "Get invited to join the groups or you can create your own group." noHistory: "No history items" -disableAnimatedMfm: "Disable MFM which has animations" +disableAnimatedMfm: "Disable MFM with animation" doing: "On my way" category: "Category" tags: "Tags" @@ -466,6 +466,16 @@ details: "Details" chooseEmoji: "Choose an emoji" unableToProcess: "The operation could not be completed." recentUsed: "Recently used" +install: "Install" +uninstall: "Uninstall" +_theme: + explore: "Explore Themes" + install: "Install theme" + manage: "Themes manager" + code: "Theme code" + installed: "{name} has been installed" + alreadyInstalled: "The theme is already installed" + invalid: "Theme format is invalid" _sfx: note: "New note" noteMy: "My note" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index 7dcb73222..d9d52e7f1 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -466,6 +466,16 @@ details: "Detalles" chooseEmoji: "Elije un emoji" unableToProcess: "La operación no se puede llevar a cabo" recentUsed: "Usado recientemente" +install: "Instalación" +uninstall: "Desinstalar" +_theme: + explore: "Explorar temas" + install: "Instalar tema" + manage: "Gestor de temas" + code: "Código del tema" + installed: "{name} ha sido instalado" + alreadyInstalled: "Este tema ya está instalado" + invalid: "El formato del tema no es válido" _sfx: note: "Notas" noteMy: "Nota (a mí mismo)" diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index b527cbd60..080026afc 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -466,6 +466,16 @@ details: "Détails" chooseEmoji: "Choisissez des emojis" unableToProcess: "L'opération n'a pas pu être complétée" recentUsed: "Récemment utilisé" +install: "Installation" +uninstall: "Désinstaller" +_theme: + explore: "Explorer les thèmes" + install: "Installer un thème" + manage: "Gestion des thèmes" + code: "Code du thème" + installed: "{name} a été installé" + alreadyInstalled: "Ce thème est déjà installé" + invalid: "Le format du thème n'est pas valide" _sfx: note: "Nouvelle note" noteMy: "Ma note" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 185764c44..6a9a6d2f6 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -466,6 +466,16 @@ details: "자세히" chooseEmoji: "이모지 선택" unableToProcess: "작업을 완료할 수 없습니다" recentUsed: "최근 사용" +install: "설치" +uninstall: "삭제" +_theme: + explore: "테마 찾아보기" + install: "테마 설치" + manage: "테마 관리" + code: "테마 코드" + installed: "{name} 테마가 설치되었습니다" + alreadyInstalled: "이미 설치된 테마입니다" + invalid: "테마 형식이 올바르지 않습니다" _sfx: note: "새 노트" noteMy: "내 노트" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index a484a1c8a..cd42bd7c8 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -466,6 +466,16 @@ details: "详情" chooseEmoji: "选择表情符号" unableToProcess: "操作无法完成" recentUsed: "最近使用" +install: "安装" +uninstall: "卸载" +_theme: + explore: "寻找主题" + install: "安装主题" + manage: "主题管理" + code: "主题代码" + installed: "{name} 已安装" + alreadyInstalled: "此主题已经安装" + invalid: "主题格式错误" _sfx: note: "帖子" noteMy: "我的笔记" From 1e93dbfa7b33eedd90b5adccb105ac6575f02b90 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 22:49:42 +0900 Subject: [PATCH 10/14] Fix dark mode sync bug --- src/client/init.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/client/init.ts b/src/client/init.ts index b9c6aedae..1fcd97190 100644 --- a/src/client/init.ts +++ b/src/client/init.ts @@ -145,6 +145,12 @@ os.init(async () => { } }, false) + os.store.watch(state => state.device.darkMode, darkMode => { + // TODO: このファイルでbuiltinThemesを参照するとcode splittingが効かず、初回読み込み時に全てのテーマコードを読み込むことになってしまい無駄なので何とかする + const themes = builtinThemes.concat(os.store.state.device.themes); + applyTheme(themes.find(x => x.id === (darkMode ? os.store.state.device.darkTheme : os.store.state.device.lightTheme))); + }); + //#region Sync dark mode if (os.store.state.device.syncDeviceDarkMode) { os.store.commit('device/set', { key: 'darkMode', value: isDeviceDarkmode() }); @@ -176,13 +182,6 @@ os.init(async () => { isMobile: isMobile }; }, - watch: { - '$store.state.device.darkMode'() { - // TODO: このファイルでbuiltinThemesを参照するとcode splittingが効かず、初回読み込み時に全てのテーマコードを読み込むことになってしまい無駄なので何とかする - const themes = builtinThemes.concat(this.$store.state.device.themes); - applyTheme(themes.find(x => x.id === (this.$store.state.device.darkMode ? this.$store.state.device.darkTheme : this.$store.state.device.lightTheme))); - } - }, methods: { api: os.api, signout: os.signout, From f0e234804da72395e4a320dc2a664c9ae4bed4e5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 22:57:13 +0900 Subject: [PATCH 11/14] :art: --- src/client/app.vue | 15 ++++++++------- src/client/themes/_dark.json5 | 1 + src/client/themes/_light.json5 | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/client/app.vue b/src/client/app.vue index 650ebbd2b..99268e42b 100644 --- a/src/client/app.vue +++ b/src/client/app.vue @@ -895,24 +895,25 @@ export default Vue.extend({ color: var(--navActive); } - &:first-child { + &:first-child, &:last-child { position: sticky; z-index: 1; - top: 0; padding-top: 8px; padding-bottom: 8px; + background: var(--wboyroyc); + -webkit-backdrop-filter: blur(8px); + backdrop-filter: blur(8px); + } + + &:first-child { + top: 0; margin-bottom: 16px; - background: var(--navBg); border-bottom: solid 1px var(--divider); } &:last-child { - position: sticky; bottom: 0; - padding-top: 8px; - padding-bottom: 8px; margin-top: 16px; - background: var(--navBg); border-top: solid 1px var(--divider); } diff --git a/src/client/themes/_dark.json5 b/src/client/themes/_dark.json5 index bc7c0efc0..b059d53be 100644 --- a/src/client/themes/_dark.json5 +++ b/src/client/themes/_dark.json5 @@ -65,5 +65,6 @@ aupeazdm: 'rgba(0, 0, 0, 0.3)', jvhmlskx: 'rgba(255, 255, 255, 0.1)', yakfpmhl: 'rgba(255, 255, 255, 0.15)', + wboyroyc: ':alpha<0.5<@navBg', }, } diff --git a/src/client/themes/_light.json5 b/src/client/themes/_light.json5 index adb128042..dea1b335c 100644 --- a/src/client/themes/_light.json5 +++ b/src/client/themes/_light.json5 @@ -65,5 +65,6 @@ aupeazdm: 'rgba(0, 0, 0, 0.1)', jvhmlskx: 'rgba(0, 0, 0, 0.1)', yakfpmhl: 'rgba(0, 0, 0, 0.15)', + wboyroyc: ':alpha<0.5<@navBg', }, } From e8cc6bf2d6120a55bb239a510bd0e49c4ffe5498 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 23:15:08 +0900 Subject: [PATCH 12/14] :art: --- src/client/pages/about-misskey.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue index 6b853d9e4..3a826499e 100644 --- a/src/client/pages/about-misskey.vue +++ b/src/client/pages/about-misskey.vue @@ -1,9 +1,14 @@