dakkar
								
							 
						 | 
						
							
							
							
							
								
							
							
								f00576bce6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
							
							
							
							
							
						 | 
						
							2024-10-09 15:17:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									syuilo
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4a356f1ba7
								
							
						 | 
						
							
							
								
								refactor(frontend): prefix css variables (#14725)
							
							
							
							
							
							
							
							* wip
* Update index.d.ts
* remove unnecessary codes 
							
						 | 
						
							2024-10-09 18:08:14 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marie
								
							 
						 | 
						
							
							
							
							
								
							
							
								72a0f16b38
								
							
						 | 
						
							
							
								
								merge: Show instance sponsors if OC is set as donation url (!642)
							
							
							
							
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/642
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Julia <julia@insertdomain.name> 
							
						 | 
						
							2024-10-08 18:07:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								a5316c06ed
								
							
						 | 
						
							
							
								
								don't log job name unless it has one
							
							
							
							
							
						 | 
						
							2024-10-08 11:01:24 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								5171ba7113
								
							
						 | 
						
							
							
								
								collapse AbortErrors
							
							
							
							
							
						 | 
						
							2024-10-08 10:43:58 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								d867c2089b
								
							
						 | 
						
							
							
								
								further condense error details
							
							
							
							
							
						 | 
						
							2024-10-08 10:43:51 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								d8e1e4890d
								
							
						 | 
						
							
							
								
								normalize ID logging
							
							
							
							
							
						 | 
						
							2024-10-08 10:33:48 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								f62cd8941c
								
							
						 | 
						
							
							
								
								condense error info
							
							
							
							
							
						 | 
						
							2024-10-08 10:33:34 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4d10aa8f8
								
							
						 | 
						
							
							
								
								fix maxAttempts calculation
							
							
							
							
							
						 | 
						
							2024-10-08 10:29:03 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								786702e076
								
							
						 | 
						
							
							
								
								condense job info
							
							
							
							
							
						 | 
						
							2024-10-08 10:27:55 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								83869e1c47
								
							
						 | 
						
							
							
								
								fix lint errors
							
							
							
							
							
						 | 
						
							2024-10-08 10:14:33 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								20dd66f735
								
							
						 | 
						
							
							
								
								improve error summaries
							
							
							
							
							
						 | 
						
							2024-10-08 10:14:26 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed0570110b
								
							
						 | 
						
							
							
								
								reduce federation log spam
							
							
							
							
							
							
							
							* Don't record stack trace for unrecoverable errors.
* Avoid logging duplicate stace traces. 
							
						 | 
						
							2024-10-08 09:30:08 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									syuilo
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d0213962bf
								
							
						 | 
						
							
							
								
								Update packages/backend/src/core/entities/FlashEntityService.ts
							
							
							
							
							
							
							
							Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com> 
							
						 | 
						
							2024-10-08 18:59:10 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazelnoot
								
							 
						 | 
						
							
							
							
							
								
							
							
								a90b4d487a
								
							
						 | 
						
							
							
								
								merge: Increase character hard limits (resolves #686 and #696) (!647)
							
							
							
							
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/647
Closes #686 and #696
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net> 
							
						 | 
						
							2024-10-07 23:20:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marie
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba5eec2129
								
							
						 | 
						
							
							
								
								merge: Prevent deletion or suspension of system accounts (resolves #625) (!666)
							
							
							
							
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/666
Closes #625
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 | 
						
							2024-10-07 19:34:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marie
								
							 
						 | 
						
							
							
							
							
								
							
							
								f7e9ffb99a
								
							
						 | 
						
							
							
								
								merge: Display instance follow/following relationships in instance view (partial implementation of 648) (!665)
							
							
							
							
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/665
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 | 
						
							2024-10-07 19:30:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd9bce3072
								
							
						 | 
						
							
							
								
								prevent login and password reset for system accounts
							
							
							
							
							
						 | 
						
							2024-10-07 14:58:39 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								126a2fcf15
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into hazelnoot/625-protect-system-accounts
							
							
							
							
							
						 | 
						
							2024-10-07 14:10:45 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								39214431f4
								
							
						 | 
						
							
							
								
								check for host
							
							
							
							
							
						 | 
						
							2024-10-07 11:45:58 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PrivateGER
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								46e53e294e
								
							
						 | 
						
							
							
								
								Parameterize followee as well
							
							
							
							
							
						 | 
						
							2024-10-07 16:47:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								0da7f9b3f6
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into hazelnoot/following-timeline
							
							
							
							
							
						 | 
						
							2024-10-07 10:45:16 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								844dfaaf5d
								
							
						 | 
						
							
							
								
								model missing "approved" property in show-user response
							
							
							
							
							
						 | 
						
							2024-10-07 10:40:44 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PrivateGER
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1c3495ef59
								
							
						 | 
						
							
							
								
								Make including followers in response a parameter
							
							
							
							
							
						 | 
						
							2024-10-07 16:23:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								a790fef261
								
							
						 | 
						
							
							
								
								prevent deletion or suspension of system accounts
							
							
							
							
							
						 | 
						
							2024-10-07 10:02:55 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PrivateGER
								
							 
						 | 
						
							
							
							
							
								
							
							
								a292e46f84
								
							
						 | 
						
							
							
								
								Pack other side of relation into response as well
							
							
							
							
							
						 | 
						
							2024-10-07 11:56:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PrivateGER
								
							 
						 | 
						
							
							
							
							
								
							
							
								fadae347ff
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui
							
							
							
							
							
						 | 
						
							2024-10-06 23:13:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marie
								
							 
						 | 
						
							
							
							
							
								
							
							
								28bfd87537
								
							
						 | 
						
							
							
								
								merge: Add option to reject reports from an instance (Resolves #579, #715, #716) (!662)
							
							
							
							
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/662
Closes #579, #715, and #716
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 | 
						
							2024-10-06 19:39:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazelnoot
								
							 
						 | 
						
							
							
							
							
								
							
							
								42dbe999e1
								
							
						 | 
						
							
							
								
								merge: Change the recent external url warning popup to the one from Cherrypick/MisskeyIO (!648)
							
							
							
							
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/648
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com> 
							
						 | 
						
							2024-10-06 17:56:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								047563bdde
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into hazelnoot/579-reject-reports
							
							
							
							
							
							
							
							# Conflicts:
#	packages/frontend/src/pages/instance-info.vue 
							
						 | 
						
							2024-10-06 12:26:25 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ca27692ac
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into hazelnoot/following-timeline
							
							
							
							
							
						 | 
						
							2024-10-06 11:16:43 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								eec4a5082d
								
							
						 | 
						
							
							
								
								fix OpenAPI definition for admin/meta.silencedHosts
							
							
							
							
							
						 | 
						
							2024-10-06 11:03:28 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazelnoot
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad4054f4e4
								
							
						 | 
						
							
							
								
								merge: Dont mark backfetched notes as silent (!655)
							
							
							
							
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/655
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net> 
							
						 | 
						
							2024-10-06 13:56:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marie
								
							 
						 | 
						
							
							
							
							
								
							
							
								17617b6355
								
							
						 | 
						
							
							
								
								merge: Include Mastodon's "indexable" property on federated user profiles (resolves #713) (!660)
							
							
							
							
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/660
Closes #713
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net> 
							
						 | 
						
							2024-10-06 10:47:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								7dd296017b
								
							
						 | 
						
							
							
								
								fix modlog and translations for "Mark as NSFW"
							
							
							
							
							
						 | 
						
							2024-10-05 22:43:34 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								61124699da
								
							
						 | 
						
							
							
								
								fix lint errors
							
							
							
							
							
						 | 
						
							2024-10-05 22:21:00 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								4da0d4be71
								
							
						 | 
						
							
							
								
								add option to reject reports from an instance
							
							
							
							
							
						 | 
						
							2024-10-05 22:01:55 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazel K
								
							 
						 | 
						
							
							
							
							
								
							
							
								c315f9ccf5
								
							
						 | 
						
							
							
								
								include Mastodon's "indexable" property on federated user profiles
							
							
							
							
							
						 | 
						
							2024-10-05 19:48:35 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PrivateGER
								
							 
						 | 
						
							
							
							
							
								
							
							
								996d079476
								
							
						 | 
						
							
							
								
								Make remove-all-following remove follows in both directions
							
							
							
							
							
						 | 
						
							2024-10-05 19:59:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PrivateGER
								
							 
						 | 
						
							
							
							
							
								
							
							
								1410f8d501
								
							
						 | 
						
							
							
								
								Experimental: dont mark backfetched notes as silent
							
							
							
							
							
						 | 
						
							2024-10-05 19:17:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PrivateGER
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3f925c426
								
							
						 | 
						
							
							
								
								Fix breaking follow relationships + add warning counts to dialogue
							
							
							
							
							
						 | 
						
							2024-10-05 19:06:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Evan Paterakis
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d633fe41bc
								
							
						 | 
						
							
							
								
								Don't depend on launcher.moe for status assets
							
							
							
							
							
						 | 
						
							2024-10-05 14:49:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									zyoshoka
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ddf8e2a3dc
								
							
						 | 
						
							
							
								
								fix(backend): correct admin/abuse-user-reports schema (#14711)
							
							
							
							
							
							
							
							* fix(backend): correct `abuse-user-reports` schema
* Update CHANGELOG.md 
							
						 | 
						
							2024-10-05 18:35:37 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									syuilo
								
							 
						 | 
						
							
							
							
							
								
							
							
								ddc799fe3d
								
							
						 | 
						
							
							
								
								fix of d8cb7305ef
							
							
							
							
							
						 | 
						
							2024-10-05 18:29:02 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									かっこかり
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9d026975bc
								
							
						 | 
						
							
							
								
								fix(backend/test): #14558 以降e2eテストがたまに失敗する問題を修正 (#14709)
							
							
							
							
							
							
							
							* fix(backend/test): MisskeyIO#727 以降e2eテストがたまに失敗する問題を修正 (MisskeyIO#735)
* ✌️
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> 
							
						 | 
						
							2024-10-05 16:20:44 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									syuilo
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d8cb7305ef
								
							
						 | 
						
							
							
								
								feat: 通報の強化 (#14704)
							
							
							
							
							
							
							
							* wip
* Update CHANGELOG.md
* lint
* Update types.ts
* wip
* ✌️
* Update MkAbuseReport.vue
* tweak 
							
						 | 
						
							2024-10-05 16:20:15 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									おさむのひと
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0d7d1091c8
								
							
						 | 
						
							
							
								
								enhance: 人気のPlayを10件以上表示できるように (#14443)
							
							
							
							
							
							
							
							Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com> 
							
						 | 
						
							2024-10-05 14:37:52 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									かっこかり
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d8bf1ff7e9
								
							
						 | 
						
							
							
								
								#14675 レビューの修正 (#14705)
							
							
							
							
							
						 | 
						
							2024-10-05 13:47:50 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									おさむのひと
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								88698462a9
								
							
						 | 
						
							
							
								
								feat(backend): 通報および通報解決時に送出されるSystemWebhookにユーザ情報を含めるようにする (#14698)
							
							
							
							
							
							
							
							* feat(backend): 通報および通報解決時に送出されるSystemWebhookにユーザ情報を含めるようにする
* テスト送信もペイロード形式を合わせる
* add spaces
* fix test 
							
						 | 
						
							2024-10-05 12:51:46 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									かっこかり
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ae3c155490
								
							
						 | 
						
							
							
								
								fix: signin の資格情報が足りないだけの場合はエラーにせず200を返すように (#14700)
							
							
							
							
							
							
							
							* fix: signin の資格情報が足りないだけの場合はエラーにせず200を返すように
* run api extractor
* fix
* fix
* fix test
* /signin -> /signin-flow
* fix
* fix lint
* rename
* fix
* fix 
							
						 | 
						
							2024-10-05 12:03:47 +09:00 | 
						
						
							
							
							
								
							
							
						 |