487b3089a0
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# README.md
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteSimple.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/widgets/WidgetInstanceInfo.vue
2023-12-23 09:14:17 +09:00
6d4aa316ac
New Crowdin updates ( #12732 )
...
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (English)
2023-12-22 18:05:41 +09:00
ea41df538e
New Crowdin updates ( #12652 )
...
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Greek)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Norwegian)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Traditional)
2023-12-19 19:40:53 +09:00
7313e13397
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/timeline.vue
2023-12-14 21:08:18 +09:00
8416329f40
New Crowdin updates ( #12352 )
...
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Greek)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
2023-12-14 14:23:54 +09:00
e3d8346e21
Merge remote-tracking branch 'misskey-original/develop' into develop
2023-11-19 17:56:14 +09:00
b65fd34981
tweak of 2b6f789a5b
2023-11-19 10:18:57 +09:00
2b6f789a5b
feat(moderation): モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能を追加 (MisskeyIO#222)
...
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2023-11-18 21:07:47 +09:00
d439dd66f9
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkNotifications.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/ui/_common_/navbar.vue
# packages/frontend/src/ui/_common_/stream-indicator.vue
2023-11-15 13:32:09 +09:00
0aa3201480
New Crowdin updates ( #12255 )
...
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Turkish)
2023-11-15 11:44:21 +09:00
da40b4df17
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkNoteDetailed.vue
# packages/frontend/src/components/global/MkCustomEmoji.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/scripts/nyaize.ts
2023-11-05 21:25:11 +09:00
8372e547eb
New Crowdin updates ( #12241 )
...
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
2023-11-04 20:40:34 +09:00
3642a2b625
New Crowdin updates ( #12231 )
...
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (English)
2023-11-04 18:45:34 +09:00
cb1005811d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/en-US.yml
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/components/MkDrive.file.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteHeader.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkReactionsViewer.reaction.vue
# packages/frontend/src/components/MkUserSetupDialog.vue
# packages/frontend/src/pages/timeline.tutorial.vue
# packages/frontend/src/pages/timeline.vue
# packages/misskey-js/etc/misskey-js.api.md
2023-11-04 01:24:44 +09:00
57d72c0db5
New Crowdin updates ( #12180 )
...
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Norwegian)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
2023-11-03 17:35:55 +09:00
7e155917e7
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
2023-10-28 16:06:07 +09:00
a91d2ba625
New Crowdin updates ( #12101 )
...
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Italian)
2023-10-28 15:59:07 +09:00
d421670b54
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/server/api/stream/channels/home-timeline.ts
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# pnpm-lock.yaml
2023-10-20 09:55:24 +09:00
d9241df84d
New Crowdin updates ( #12070 )
...
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
2023-10-19 19:47:36 +09:00
4d00155a42
feat: ワードミュートに該当したノートを非表示にできるように
2023-10-19 19:15:53 +09:00
eacb74cb44
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/entities/NoteEntityService.ts
# packages/backend/src/models/Note.ts
# packages/backend/src/server/api/endpoints/roles/notes.ts
# packages/backend/src/server/api/stream/channels/global-timeline.ts
# packages/backend/src/server/api/stream/channels/home-timeline.ts
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/backend/src/server/api/stream/channels/local-timeline.ts
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/store.ts
2023-10-18 21:22:51 +09:00
92b49b6ebb
New Crowdin updates ( #12036 )
...
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
2023-10-18 17:41:32 +09:00
5efd01ba70
feat: サーバーサイレンス機能を追加 ( #12031 )
...
* feat : サーバーサイレンスを追加
* Update CHANGELOG.md
* Update CHANGELOG.md
* Update locale
* Update instance-info.vue
* update misskey-js.api.md
* lint fix
* migration fix
* 既存のものを使うように
* fix
* 色々直した
* Update packages/frontend/src/pages/admin/instance-block.vue
* Update packages/frontend/src/pages/admin/instance-block.vue
* Update packages/frontend/src/components/MkInstanceCardMini.vue
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/UserFollowingService.ts
* Update packages/backend/src/core/UserFollowingService.ts
* fix: サイレンスされてるサーバーからの投稿は全部ホームにする
* fix: undefinedでfalseを返すようにした
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-10-16 20:11:27 +09:00
2e7c034b99
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# CHANGELOG.md
# packages/backend/src/server/api/endpoints/channels/timeline.ts
2023-10-11 06:22:57 +09:00
61ff98c8dd
New Crowdin updates ( #12000 )
...
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
2023-10-10 19:03:21 +09:00
d691a130e2
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkDrive.file.vue
# packages/frontend/src/components/MkNote.vue
2023-10-10 18:32:52 +09:00
57b794edfb
New Crowdin updates ( #11999 )
...
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
2023-10-10 18:14:09 +09:00
dd4ecf845c
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/stream/channels/global-timeline.ts
# packages/backend/src/server/api/stream/channels/home-timeline.ts
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/backend/src/server/api/stream/channels/local-timeline.ts
2023-10-09 19:46:43 +09:00
fce557715b
New Crowdin updates ( #11980 )
...
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
2023-10-09 12:37:04 +09:00
560482315b
Merge remote-tracking branch 'misskey-original/develop' into timeline-toka
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/server/api/endpoints/admin/emoji/add.ts
# packages/backend/src/server/api/stream/channels/global-timeline.ts
# packages/backend/src/server/api/stream/channels/home-timeline.ts
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/backend/src/server/api/stream/channels/local-timeline.ts
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/pages/timeline.vue
# pnpm-lock.yaml
2023-10-07 04:15:59 +09:00
d49e5b19e1
New Crowdin updates ( #11933 )
...
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Norwegian)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Greek)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Italian)
2023-10-06 21:12:04 +09:00
e4ade46a2d
fix(frontend): クライアント設定から13.7.0で削除されたチャット機能に関するサウンド設定を削除 ( #11912 )
...
* fix(frontend): クライアント設定から13.7.0で削除されたチャット機能に関するサウンド設定を削除
* fix(frontend): 各localesからsfx/chat sfx/chatbgを削除
2023-10-04 20:17:05 +09:00
b96c76b2c5
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# package.json
2023-09-30 10:24:26 +09:00
b0714cbd7b
[ci skip] New Crowdin updates ( #11922 )
...
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
2023-09-30 09:35:36 +09:00
7dbbfb657c
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# CHANGELOG.md
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/ui/deck/tl-column.vue
# pnpm-lock.yaml
2023-09-29 23:08:01 +09:00
b55ffa2cbe
New Crowdin updates ( #11901 )
...
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Thai)
2023-09-29 15:15:22 +09:00
a6ae84df71
Merge remote-tracking branch 'misskey-dev/master' into prismisskey
...
# Conflicts:
# package.json
2023-09-25 21:13:56 +09:00
ee44f35fea
[skip ci] New Crowdin updates ( #11891 )
...
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
2023-09-25 13:57:09 +09:00
969b16d9c2
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# package.json
2023-09-24 18:15:21 +09:00
65aef45050
New Crowdin updates ( #11885 )
...
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
2023-09-24 18:14:17 +09:00
4e9aa25394
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# package.json
2023-09-24 11:15:32 +09:00
2b561d2648
New Crowdin updates ( #11875 )
...
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Greek)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Norwegian)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Italian)
2023-09-24 11:10:05 +09:00
d56d84c664
Merge remote-tracking branch 'misskey-dev/develop' into rainbow
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints/admin/emoji/add.ts
# packages/frontend/src/components/MkMenu.vue
2023-09-23 21:00:15 +09:00
b60b214c0c
New Crowdin updates ( #11866 )
...
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
2023-09-23 18:47:21 +09:00
a63bef2d8f
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# package.json
# packages/frontend/src/pages/settings/general.vue
2023-09-22 20:03:34 +09:00
ee83b9542e
New Crowdin updates ( #11856 )
...
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
2023-09-22 16:46:08 +09:00
f05f911916
feat: メディアタイムライン実装
2023-09-21 17:31:23 +09:00
1516de1fee
feat: メディアタイムラインを輸入 ( #103 )
...
* メディアタイムラインの実装
* refactor(stream): ストリーミングにwithFilesオプションを実装
---------
Co-authored-by: tar_bin <tar.bin.master@gmail.com>
2023-09-21 16:39:56 +09:00
bbd5282dc6
feat: ゲーミングモード実装
2023-09-21 16:39:18 +09:00
d9db4449b4
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# CHANGELOG.md
# package.json
# packages/frontend/src/components/MkInstanceTicker.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/settings/theme.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/ui/_common_/navbar-for-mobile.vue
# packages/frontend/src/ui/_common_/navbar.vue
# packages/frontend/src/ui/universal.vue
# packages/frontend/src/widgets/WidgetInstanceInfo.vue
2023-09-21 00:20:12 +09:00
mattyatea
syuilo
Nafu Satsuki
まっちゃてぃー
Camilla Ett
まっちゃとーにゅ