Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								00cfeca3d7 
								
							 
						 
						
							
							
								
								merge: Add "is from local bubble instance" role condition ( !1011 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1011 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-05-12 20:08:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								7c5e0ce4ab 
								
							 
						 
						
							
							
								
								add hint about bubble timeline roles  
							
							
							
						 
						
							2025-05-12 14:01:30 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								022337c1e7 
								
							 
						 
						
							
							
								
								translate bubble timeline controls  
							
							
							
						 
						
							2025-05-12 13:57:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								03d6655f92 
								
							 
						 
						
							
							
								
								fix wording of "User is from a bubble instance"  
							
							
							
						 
						
							2025-05-12 13:31:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								655290f8a4 
								
							 
						 
						
							
							
								
								add "is from local bubble instance" role condition  
							
							
							
						 
						
							2025-05-12 13:31:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								835e76152e 
								
							 
						 
						
							
							
								
								merge: Add pattern checker for word mutes ( resolves   #1003 ) ( !1020 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1020 
Closes  #1003 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-05-12 10:33:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								f6796a99ec 
								
							 
						 
						
							
							
								
								add SkWordMuteTest to moderation control panel  
							
							
							
						 
						
							2025-05-10 22:48:50 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								32b860c352 
								
							 
						 
						
							
							
								
								add UI for testing word mutes  
							
							
							
						 
						
							2025-05-10 22:32:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								7f3dc6066d 
								
							 
						 
						
							
							
								
								add warning for role conditions that are dependent on remote data  
							
							
							
						 
						
							2025-05-10 14:44:27 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								40a73bfcbe 
								
							 
						 
						
							
							
								
								add new role conditions for local/remote followers/followees  
							
							
							
						 
						
							2025-05-10 14:44:17 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								56a8ff4f50 
								
							 
						 
						
							
							
								
								add isFromInstance role condition  
							
							
							
						 
						
							2025-05-09 21:03:05 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								d244158db6 
								
							 
						 
						
							
							
								
								remove question mark in title  
							
							
							
						 
						
							2025-05-08 17:51:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b753b2ea3a 
								
							 
						 
						
							
							
								
								add poll edit warning  
							
							
							
						 
						
							2025-05-08 19:47:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								805ec98ec0 
								
							 
						 
						
							
							
								
								update description of "enable proxy account" toggle  
							
							
							
						 
						
							2025-05-02 08:32:39 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								8dce293dff 
								
							 
						 
						
							
							
								
								add setting to disable proxy account ( resolves   #766 )  
							
							
							
						 
						
							2025-05-01 12:07:38 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								bdaccb21eb 
								
							 
						 
						
							
							
								
								remove translations that have been upstreamed  
							
							
							
						 
						
							2025-04-14 15:08:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								91fb75dece 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2025-03-24  
							
							
							
						 
						
							2025-04-13 13:07:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2b510dc2da 
								
							 
						 
						
							
							
								
								upd: add deleteThisAccountConfirm  
							
							
							
						 
						
							2025-04-06 00:16:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								74d301dcf1 
								
							 
						 
						
							
							
								
								fix frontend lint errors  
							
							
							
						 
						
							2025-04-02 10:59:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								d8908ef2d8 
								
							 
						 
						
							
							
								
								merge upstream  
							
							
							
						 
						
							2025-03-25 16:14:53 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Ares 
								
							 
						 
						
							
							
							
							
								
							
							
								070f30965e 
								
							 
						 
						
							
							
								
								Fixing en-US.yml  
							
							
							
						 
						
							2025-03-23 14:07:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								aa1691295b 
								
							 
						 
						
							
							
								
								merge: Make confirm follow prompt not show up when cancelling a follow request ( !941 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/941 
Closes  #822 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com> 
							
						 
						
							2025-03-21 16:46:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								a35c2f214b 
								
							 
						 
						
							
							
								
								convert Authorized Fetch to a setting and add support for hybrid mode (essential metadata only)  
							
							
							
						 
						
							2025-03-16 10:07:57 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								d0a074ac89 
								
							 
						 
						
							
							
								
								fetch linked notes manually, unless we have them in DB - fixes 1006  
							
							
							
						 
						
							2025-03-15 19:17:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								91e15fafbf 
								
							 
						 
						
							
							
								
								upd: confirm dialog for undoing follow request  
							
							
							
						 
						
							2025-03-08 11:54:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								daa449152d 
								
							 
						 
						
							
							
								
								upd: allow users to remove avatars  
							
							
							
						 
						
							2025-03-05 19:48:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								5d1e1a2215 
								
							 
						 
						
							
							
								
								fix typo in "cannotLoadPage" translation  
							
							
							
						 
						
							2025-03-02 13:38:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								e5b8fc3c80 
								
							 
						 
						
							
							
								
								add missing modlog render blocks  
							
							
							
						 
						
							2025-03-02 13:38:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								20e2a6e95a 
								
							 
						 
						
							
							
								
								add SkFetchNote to render a note by ID  
							
							
							
						 
						
							2025-03-02 13:38:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								27d43879a2 
								
							 
						 
						
							
							
								
								add moderation logs for many endpoints  
							
							... 
							
							
							
							- `/admin/delete-all-files-of-a-user`
- `/admin/nsfw-user`
- `/admin/unnsfw-user`
- `/admin/silence-user`
- `/admin/unsilence-user`
- `/admin/accounts/create`
- `/admin/drive/clean-remote-files`
- `/admin/drive/cleanup`
- `/admin/emoji/set-category-bulk`
- `/admin/emoji/set-license-bulk`
- `/admin/emoji/set-aliases-bulk`
- `/admin/emoji/add-aliases-bulk`
- `/admin/emoji/remove-aliases-bulk`
- `/admin/emoji/import-zip`
- `/admin/federation/delete-all-files`
- `/admin/federation/remove-all-following`
- `/admin/promo/create`
- `/admin/relay/add`
- `/admin/relay/remove` 
							
						 
						
							2025-03-02 13:38:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								14a81b4f85 
								
							 
						 
						
							
							
								
								merge: Add "reject quotes" settings ( !901 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/901 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-03-01 03:33:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								c6cabb8c75 
								
							 
						 
						
							
							
								
								merge: Fix file description labels to use "alt text" terminology ( !911 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/911 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com> 
							
						 
						
							2025-02-22 03:23:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jacob Hall 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c610f446b 
								
							 
						 
						
							
							
								
								do not change "description" key to "Alt text"  
							
							... 
							
							
							
							- switch Drive file info view to use the `caption` rather than
  `description` i18n key, so that it reads "Alt text" 
							
						 
						
							2025-02-20 11:21:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								365a0bd2c5 
								
							 
						 
						
							
							
								
								improve labels and wording for reject quotes feature  
							
							
							
						 
						
							2025-02-20 09:58:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								292d3b9229 
								
							 
						 
						
							
							
								
								add "reject quotes" toggle at user and instance level  
							
							... 
							
							
							
							+ improve, cleanup, and de-duplicate quote resolution
+ add warning message when quote cannot be loaded
+ add "process error" framework to display warnings when a note cannot be correctly loaded from another instance 
							
						 
						
							2025-02-20 09:57:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jacob Hall 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9f3702cf3 
								
							 
						 
						
							
							
								
								fix file description labels to use "alt text" terminology  
							
							
							
						 
						
							2025-02-19 18:44:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								c32bde739e 
								
							 
						 
						
							
							
								
								add translation entry for "write:admin:cw-user"  
							
							
							
						 
						
							2025-02-16 19:20:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								568d82a974 
								
							 
						 
						
							
							
								
								record ModLog entry when setting a user's content warning  
							
							
							
						 
						
							2025-02-16 19:20:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								4f79f85703 
								
							 
						 
						
							
							
								
								fix TypeScript errors in modlog.MogLog.vue  
							
							
							
						 
						
							2025-02-16 19:20:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								ea89348b62 
								
							 
						 
						
							
							
								
								add user-level "force content warning" moderation feature  
							
							
							
						 
						
							2025-02-16 19:20:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								667262dcfb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							... 
							
							
							
							# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/SearchService.ts
#	packages/frontend/src/pages/search.note.vue
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml 
							
						 
						
							2025-02-13 17:04:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								ed981a6970 
								
							 
						 
						
							
							
								
								add new note search file types (module, flash) and optimize file type query  
							
							
							
						 
						
							2025-02-13 09:28:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								feb80ee992 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							
							
						 
						
							2025-02-11 10:52:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								363111f5de 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							... 
							
							
							
							# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/server/api/EndpointsModule.ts
#	packages/backend/src/server/api/endpoints.ts
#	packages/misskey-js/src/autogen/endpoint.ts
#	sharkey-locales/en-US.yml 
							
						 
						
							2025-02-10 23:34:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								58ad9b13ab 
								
							 
						 
						
							
							
								
								merge: add missing translations for admin perms -  fixes   #918  ( !893 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/893 
Closes  #918 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-10 16:18:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								43d4835c2f 
								
							 
						 
						
							
							
								
								add missing translations for admin perms -  fixes   #918  
							
							
							
						 
						
							2025-02-10 10:48:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								83afdc883a 
								
							 
						 
						
							
							
								
								clearer warning when replacing saved keys  
							
							
							
						 
						
							2025-02-07 18:46:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								f36029f795 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							... 
							
							
							
							# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/entities/UserEntityService.ts
#	packages/frontend/src/_dev_boot_.ts
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml 
							
						 
						
							2025-02-07 11:57:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c889948f95 
								
							 
						 
						
							
							
								
								feat: Add generation of keys to admin page  
							
							
							
						 
						
							2025-02-07 06:00:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								889804b2a8 
								
							 
						 
						
							
							
								
								add settings UI to configure defaultCW and defaultCWPriority  
							
							
							
						 
						
							2025-02-05 14:22:50 -05:00