usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,521 Commits 398 Branches 1,053 Tags 326 MiB
Commit Graph

6026 Commits

Author SHA1 Message Date
mattyatea 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
syuilo 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
mattyatea cba5f494ff Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/misskey-js/etc/misskey-js.api.md
 2023-10-08 21:57:02 +09:00
かっこかり 4bbfc98883
Feat: タイムライン更新中に広告を挿入 (#11989) 
* Feat: タイムライン更新中に広告を挿入

* 翻訳を変更

* Run api extractor

* fix api extractor

* Update locales/ja-JP.yml

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* confirm -> mkinfo

* MkInputにmin, maxを指定できるように

* 負の値が指定されたら何もしない

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-08 17:56:44 +09:00
mattyatea b09bfd5ad2 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/notes/global-timeline.ts
#	packages/backend/src/server/api/endpoints/notes/local-timeline.ts
#	packages/backend/src/server/api/endpoints/notes/timeline.ts
#	packages/misskey-js/etc/misskey-js.api.md
 2023-10-07 20:19:36 +09:00
かっこかり 5e8c0deab3
プライバシーポリシー・運営者情報のリンクを追加 (#11925) 
* 運営者情報・プライバシーポリシーリンクを追加

* Update Changelog

* Run api extractor

* プライバシーポリシー・利用規約の同意をまとめる

* Update Changelog

* fix lint

* fix

* api extractor

* improve design

* nodeinfoにプライバシーポリシー・運営者情報を追加
 2023-10-07 13:13:13 +09:00
mattyatea abb79a0b36 ユーザーのページでノートを表示するかハイライトを表示するか決められるようにした 2023-10-07 10:40:08 +09:00
mattyatea c3ced9b75f Revert "revert: note editing" 
This reverts commit b4032988
 2023-10-07 07:42:27 +09:00
mattyatea 2bb86104f6 なんとなくTLを見れるようにした 2023-10-07 07:15:13 +09:00
mattyatea 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
syuilo 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
mattyatea 696417140f リモートユーザーの情報更新簡単にした 2023-10-06 08:35:41 +09:00
mattyatea c345383374 ドライブで複数選択できるようにした 2023-10-06 08:01:42 +09:00
Camilla Ett 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
syuilo b40329887f revert: note editing 2023-10-04 12:05:01 +09:00
syuilo 17b83ff4c1 enhance: TLキャッシュ容量を設定できるように 2023-10-04 08:46:27 +09:00
syuilo 6277a5545c
feat: improve tl performance (#11946) 
* wip

* wip

* wip

* wip

* wip

* wip

* Update NoteCreateService.ts

* wip

* wip

* wip

* wip

* Update NoteCreateService.ts

* wip

* Update NoteCreateService.ts

* wip

* Update user-notes.ts

* wip

* wip

* wip

* Update NoteCreateService.ts

* wip

* Update timeline.ts

* Update timeline.ts

* Update timeline.ts

* Update timeline.ts

* Update timeline.ts

* wip

* Update timelines.ts

* Update timelines.ts

* Update timelines.ts

* wip

* wip

* wip

* Update timelines.ts

* Update misskey-js.api.md

* Update timelines.ts

* Update timelines.ts

* wip

* wip

* wip

* Update timelines.ts

* wip

* Update timelines.ts

* wip

* test

* Update activitypub.ts

* refactor: UserListJoining -> UserListMembership

* Update NoteCreateService.ts

* wip
 2023-10-03 20:26:11 +09:00
mattyatea ac1367a0b9 TLの絞り込み保存できるようにした 2023-09-30 19:02:17 +09:00
mattyatea db20241627 fix 虚無ボタン 2023-09-30 11:31:59 +09:00
mattyatea b96c76b2c5 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-30 10:24:26 +09:00
syuilo 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
syuilo 392de4df36 enhance: ノートの翻訳機能の利用可否をロールで設定可能に 
Resolve #11923
 2023-09-30 07:54:11 +09:00
mattyatea 582a6948e5 いいかんじ 2023-09-29 23:18:18 +09:00
mattyatea 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
syuilo e5c339b86a enhance(frontend): タイムラインでファイルが添付されたノートのみ表示するオプションを追加 2023-09-29 16:56:17 +09:00
syuilo 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
syuilo 9771f1c435 enhance: improve moderation log 2023-09-29 13:26:11 +09:00
syuilo b9da1415a5 feat: 通知の受信設定を強化 2023-09-29 11:29:54 +09:00
syuilo 2438c047a7 enhance: 編集されたノートかどうか分かるように 2023-09-28 21:06:14 +09:00
mattyatea b2df78ffcd Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	packages/frontend/src/components/MkPostForm.vue
 2023-09-28 18:13:48 +09:00
syuilo c106db89e1 feat: note edit 2023-09-28 17:21:16 +09:00
mattyatea 81f56f08b7 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	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/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/deck/deck-store.ts
 2023-09-28 16:11:39 +09:00
syuilo eb740e2c72 enhance: タイムラインからRenoteを除外するオプションを追加 2023-09-28 11:41:41 +09:00
syuilo 055464a624 enhance: improve moderation log 2023-09-28 10:02:05 +09:00
mattyatea 2b72034847 mfmのやつ 2023-09-27 16:40:32 +09:00
mattyatea a6ae84df71 Merge remote-tracking branch 'misskey-dev/master' into prismisskey 
# Conflicts:
#	package.json
 2023-09-25 21:13:56 +09:00
mattyatea b8c4c09e59 公開範囲、見やすく。 2023-09-25 21:12:22 +09:00
syuilo bd19d75c9c enhance: improve moderation log 2023-09-25 16:03:43 +09:00
syuilo 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
syuilo 5318532a8d enhance: improve moderation log 2023-09-25 10:29:12 +09:00
mattyatea 1a9d3737b1 ゲーミングのスピードの調整 2023-09-25 02:57:48 +09:00
mattyatea 8154d86a9d widgetにゲーミングのオンオフを追加 2023-09-25 02:56:53 +09:00
mattyatea 969b16d9c2 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-24 18:15:21 +09:00
syuilo 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
mattyatea 2fa2242255 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-24 16:41:37 +09:00
syuilo 80d52f65eb Update index.d.ts 2023-09-24 15:41:07 +09:00
syuilo 841e6ff901 improve moderation log 2023-09-24 15:40:38 +09:00
mattyatea 4e9aa25394 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-24 11:15:32 +09:00
syuilo 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
syuilo 8e5a90589d improve moderation log 2023-09-24 10:57:24 +09:00