KevinWh0 
								
							 
						 
						
							
							
							
							
								
							
							
								c87ed51311 
								
							 
						 
						
							
							
								
								made it so you can pick a search engine  
							
							
							
						 
						
							2024-06-12 13:35:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kisaragi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff3a38a7f5 
								
							 
						 
						
							
							
								
								fix(frontend): 追加情報のラベルを投稿者のサーバーの絵文字で表示する ( #13968 )  
							
							... 
							
							
							
							* fix(frontend): 追加情報のラベルを投稿者のサーバーの絵文字で表示する
* docs: update changelog 
							
						 
						
							2024-06-12 10:52:22 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sugar 
								
							 
						 
						
							
							
							
							
								
							
							
								a061c6c2d5 
								
							 
						 
						
							
							
								
								reduce margin-top for collapsed in replies to in small containers  
							
							
							
						 
						
							2024-06-11 20:33:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sugar 
								
							 
						 
						
							
							
							
							
								
							
							
								c149734fba 
								
							 
						 
						
							
							
								
								avoid renoteCollapsed dependency in inReplyToCollapsed  
							
							
							
						 
						
							2024-06-11 19:57:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sugar 
								
							 
						 
						
							
							
							
							
								
							
							
								460e7f05ab 
								
							 
						 
						
							
							
								
								correct collapsed in reply to line alignment with small screen sizes  
							
							
							
						 
						
							2024-06-11 17:24:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sugar 
								
							 
						 
						
							
							
							
							
								
							
							
								9ce2c8c081 
								
							 
						 
						
							
							
								
								include usernames in collapsed notes replied to  
							
							
							
						 
						
							2024-06-11 17:19:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								fe0d95b277 
								
							 
						 
						
							
							
								
								remove duplicate settings switch  
							
							
							
						 
						
							2024-06-11 15:48:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sugar 
								
							 
						 
						
							
							
							
							
								
							
							
								c808147292 
								
							 
						 
						
							
							
								
								replace reply with inReplyTo in in-reply-to collapse code  
							
							
							
						 
						
							2024-06-11 16:28:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sugar 
								
							 
						 
						
							
							
							
							
								
							
							
								c9d0b81555 
								
							 
						 
						
							
							
								
								feat: add an option to collapse replies  
							
							
							
						 
						
							2024-06-11 15:25:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								8f3549b494 
								
							 
						 
						
							
							
								
								merge:  fix   #520 , render usernames containing custom emoji in welcome toast properly ( !541 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/541 
Closes  #520 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch> 
							
						 
						
							2024-06-09 21:02:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								6060fdcae7 
								
							 
						 
						
							
							
								
								merge: celebrate our testers -  fixes   #552  ( !543 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/543 
Closes  #552 
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se> 
							
						 
						
							2024-06-09 15:23:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tess 
								
							 
						 
						
							
							
							
							
								
							
							
								e7b87c0269 
								
							 
						 
						
							
							
								
								Pass renderMfm as true to wrap welcome back toast in Mfm  
							
							
							
						 
						
							2024-06-09 16:21:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tess 
								
							 
						 
						
							
							
							
							
								
							
							
								ce197bc2e6 
								
							 
						 
						
							
							
								
								add ability to conditionally wrap toast message in Mfm tag  
							
							
							
						 
						
							2024-06-09 16:19:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tess K 
								
							 
						 
						
							
							
							
							
								
							
							
								df333d1855 
								
							 
						 
						
							
							
								
								merge: Add tess to contributor list ( !542 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/542 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch> 
							
						 
						
							2024-06-09 12:55:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								2768245bc7 
								
							 
						 
						
							
							
								
								fix link to "all contributors" graphs  
							
							
							
						 
						
							2024-06-09 10:11:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								450b2abdae 
								
							 
						 
						
							
							
								
								add section for testers in about page  
							
							
							
						 
						
							2024-06-09 10:11:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								0b39869bdc 
								
							 
						 
						
							
							
								
								merge: better block display for <bdi> elements -  fixes   #550  ( !538 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/538 
Closes  #550 
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se> 
							
						 
						
							2024-06-09 08:50:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tess 
								
							 
						 
						
							
							
							
							
								
							
							
								5bbdd07c95 
								
							 
						 
						
							
							
								
								Add tess to contributor list  
							
							
							
						 
						
							2024-06-09 03:46:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tess 
								
							 
						 
						
							
							
							
							
								
							
							
								c8535b5d26 
								
							 
						 
						
							
							
								
								MkToast Mfm plain prop should be static  
							
							
							
						 
						
							2024-06-09 03:34:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tess 
								
							 
						 
						
							
							
							
							
								
							
							
								3bfff3509c 
								
							 
						 
						
							
							
								
								fix custom emoji in welcome message  
							
							
							
						 
						
							2024-06-09 03:20:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								e7fcdd47e5 
								
							 
						 
						
							
							
								
								another semicolon  
							
							
							
						 
						
							2024-06-08 17:34:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								cc6b9f4cb0 
								
							 
						 
						
							
							
								
								spaces  
							
							
							
						 
						
							2024-06-08 17:34:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								f64e6e8646 
								
							 
						 
						
							
							
								
								semicolons  
							
							
							
						 
						
							2024-06-08 17:33:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								c0f9e44712 
								
							 
						 
						
							
							
								
								fix accesses to canRenote  
							
							
							
						 
						
							2024-06-08 17:30:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								5dc8c2827c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into future-2024-05-31  
							
							
							
						 
						
							2024-06-08 16:45:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zyoshoka 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9849aab402 
								
							 
						 
						
							
							
								
								test( #10336 ): add components/MkC.* stories ( #13830 )  
							
							... 
							
							
							
							* test(storybook): add `components/MkC.*` stories
* test(storybook): add some tests
* test: add sleep
* test: comment-out flaky test
* test(storybook): add test for `MkChannelFollowButton`
* chore(storybook): tweak sleep duration in `MkChannelFollowButton` story test
* fix(chromatic): add delay to `MkChannelList`
* chore: replace `mswDecorator` with `mswLoader`
* fix(storybook): tweak some parameters
* chore: serve static files
* fix(chromatic): add delay to `MkCwButton`
* chore: delete logging for debug
* fix: add right click in `MkContextMenu` play
* refactor: remove unused imports 
							
						 
						
							2024-06-08 18:00:54 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									おさむのひと 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61fae45390 
								
							 
						 
						
							
							
								
								feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする ( #13758 )  
							
							... 
							
							
							
							* feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする
* モデログに対応&エンドポイントを単一オブジェクトでのサポートに変更(API経由で大量に作るシチュエーションもないと思うので)
* fix spdx
* fix migration
* fix migration
* fix models
* add e2e webhook
* tweak
* fix modlog
* fix bugs
* add tests and fix bugs
* add tests and fix bugs
* add tests
* fix path
* regenerate locale
* 混入除去
* 混入除去
* add abuseReportResolved
* fix pnpm-lock.yaml
* add abuseReportResolved test
* fix bugs
* fix ui
* add tests
* fix CHANGELOG.md
* add tests
* add RoleService.getModeratorIds tests
* WebhookServiceをUserとSystemに分割
* fix CHANGELOG.md
* fix test
* insertOneを使う用に
* fix
* regenerate locales
* revert version
* separate webhook job queue
* fix
* 🎨 
* Update QueueProcessorService.ts
---------
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> 
							
						 
						
							2024-06-08 15:34:19 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								388926775e 
								
							 
						 
						
							
							
								
								I meant finally, not then, thanks fEmber  
							
							
							
						 
						
							2024-06-07 14:47:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								cb43994841 
								
							 
						 
						
							
							
								
								only allow a single boost via hotkey -  fixes   #467   #468  
							
							... 
							
							
							
							As usual, have to write the same thing four times ☹
The parentheses around `q` tell the hotkey/keymap code to ignore
auto-repeat events (which works fine in Chrome but not in Firefox, I
reported the bug https://bugzilla.mozilla.org/show_bug.cgi?id=1900397 
)
In addition, I've added a guard variable that is true while calling
the backend to boost/renote, and false otherwise. This way, even in
Firefox we don't spam-boost. Unboosting is still *only with the
mouse*, I have not added that functionality. 
							
						 
						
							2024-06-07 11:40:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								43c0ffe7f8 
								
							 
						 
						
							
							
								
								better block display for <bdi> elements  
							
							... 
							
							
							
							We use MfM in all sorts of places, and only some of them are actual
blocks. We can now tell the `Mfm` component to make the top-level
`<bdi>` a block when we need to (mostly note bodies, user
descriptions, announcements) and leave it inline in all other places.
This should still rendener inline rtl content embedded in ltr text in
a sensible way, while providing right-alignment for fully rtl blocks. 
							
						 
						
							2024-06-07 11:18:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								43cccaaee9 
								
							 
						 
						
							
							
								
								fix  
							
							
							
						 
						
							2024-06-04 13:15:35 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27ac3d795e 
								
							 
						 
						
							
							
								
								Update about-misskey.vue  
							
							
							
						 
						
							2024-06-04 13:14:37 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Amelia Yukii 
								
							 
						 
						
							
							
							
							
								
							
							
								9520a14cb9 
								
							 
						 
						
							
							
								
								merge: avoid await at top-level in setup - fixes frontend tests ( !534 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/534 
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de> 
							
						 
						
							2024-06-03 16:28:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								92cd771e0f 
								
							 
						 
						
							
							
								
								avoid await at top-level in setup - fixes frontend tests  
							
							
							
						 
						
							2024-06-03 16:28:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								81ed739380 
								
							 
						 
						
							
							
								
								fix: button saying Misskey instead of Sharkey  
							
							
							
						 
						
							2024-05-31 21:18:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								e818c56faa 
								
							 
						 
						
							
							
								
								merge: Feature/favicon notification dot ( !474 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/474 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Marie <marie@kaifa.ch> 
							
						 
						
							2024-05-31 19:03:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								928f65be72 
								
							 
						 
						
							
							
								
								merge: style: automatically detect RTL on all MFM content ( !482 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/482 
Closes  #356 
Approved-by: Tess K <me@thvxl.se>
Approved-by: dakkar <dakkar@thenautilus.net> 
							
						 
						
							2024-05-31 18:42:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								886948769e 
								
							 
						 
						
							
							
								
								merge: fix custom emoji pagination when searching -  fixes   #490  ( !489 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/489 
Closes  #490 
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch> 
							
						 
						
							2024-05-31 18:39:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								3f76cfe9a6 
								
							 
						 
						
							
							
								
								Merge tag '2024.5.0' into future-2024-05-31  
							
							
							
						 
						
							2024-05-31 19:34:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								349856bbac 
								
							 
						 
						
							
							
								
								fix more linting  
							
							
							
						 
						
							2024-05-31 15:56:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								8c301de790 
								
							 
						 
						
							
							
								
								lint frontend  
							
							
							
						 
						
							2024-05-31 13:24:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								43bd8ace96 
								
							 
						 
						
							
							
								
								replace icons  
							
							
							
						 
						
							2024-05-31 12:41:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								3372e0ffe1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'misskey/release/2024.5.0' into future  
							
							
							
						 
						
							2024-05-31 12:26:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								7b630b48b5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into future  
							
							
							
						 
						
							2024-05-31 11:43:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								0a9697b405 
								
							 
						 
						
							
							
								
								merge: correcty load/save withBots -  fixes   #528  ( !522 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/522 
Closes  #528 
Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com> 
							
						 
						
							2024-05-31 10:38:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								030082f756 
								
							 
						 
						
							
							
								
								🎨  
							
							
							
						 
						
							2024-05-31 19:35:27 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								4ddee7b01e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into future  
							
							
							
						 
						
							2024-05-31 11:24:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								be11fd7508 
								
							 
						 
						
							
							
								
								enhance: サーバーのお問い合わせ先URLを設定できるように  
							
							
							
						 
						
							2024-05-31 10:12:23 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								ac4a001e9f 
								
							 
						 
						
							
							
								
								fix code style  
							
							
							
						 
						
							2024-05-31 10:11:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Amelia Yukii 
								
							 
						 
						
							
							
							
							
								
							
							
								55fc2879f3 
								
							 
						 
						
							
							
								
								merge: set the correct "marked an NSFW" when loading admin-user ( !483 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/483 
Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com> 
							
						 
						
							2024-05-30 14:22:00 +00:00