| 
								
								
									 Hazel K | cd9bce3072 | prevent login and password reset for system accounts | 2024-10-07 14:58:39 -04:00 |  | 
				
					
						| 
								
								
									 Hazel K | 0da7f9b3f6 | Merge branch 'develop' into hazelnoot/following-timeline | 2024-10-07 10:45:16 -04: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 |  | 
				
					
						| 
								
								
									 PrivateGER | f028795483 | Move text into translation files | 2024-10-06 20:31:41 +02: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 | b9e89edbc7 | add missing translation | 2024-10-06 11:16:18 -04:00 |  | 
				
					
						| 
								
								
									 Hazel K | 9b11aead5a | Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked | 2024-10-06 10:48:20 -04:00 |  | 
				
					
						| 
								
								
									 Hazel K | 7dd296017b | fix modlog and translations for "Mark as NSFW" | 2024-10-05 22:43:34 -04:00 |  | 
				
					
						| 
								
								
									 Hazel K | 4da0d4be71 | add option to reject reports from an instance | 2024-10-05 22:01:55 -04:00 |  | 
				
					
						| 
								
								
									 Hazel K | b23d650a15 | warn when a domain is hard-blocked by a base domain | 2024-10-05 20:42:31 -04:00 |  | 
				
					
						| 
								
								
									 Hazel K | e622ab7cc7 | indicate if a user is blocked / muted by the current user | 2024-10-05 19:13:09 -04:00 |  | 
				
					
						| 
								
								
									 PrivateGER | b3f925c426 | Fix breaking follow relationships + add warning counts to dialogue | 2024-10-05 19:06:05 +02:00 |  | 
				
					
						| 
								
								
									 PrivateGER | 99a0f756ff | Expose instance-moderation endpoints in UI | 2024-10-05 19:06:05 +02:00 |  | 
				
					
						| 
								
								
									 Marie | b0568e2baa | chore: remove unused locale | 2024-10-04 02:33:02 +02:00 |  | 
				
					
						| 
								
								
									 Marie | d5b372f7a9 | upd&merge: Merge Cherrypick/MisskeyIO's external url popup, delete old popup warning and modify script to handle undefined domains | 2024-10-04 02:31:22 +02:00 |  | 
				
					
						| 
								
								
									 Marie | ac1e5a0fb5 | merge: Feat: Implement "Show Below Avatar" for Avatar Decorations (!645) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/645
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> | 2024-10-03 20:40:34 +00:00 |  | 
				
					
						| 
								
								
									 Marie | aedc5fba81 | merge: Disabling cat speak on the client (!609) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/609
Closes #604
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> | 2024-10-03 19:51:35 +00:00 |  | 
				
					
						| 
								
								
									 Hazel K | 97a16c2ebc | Merge branch 'develop' into hazelnoot/following-timeline | 2024-10-03 14:00:06 -04:00 |  | 
				
					
						| 
								
								
									 Marie | 85b0dad84e | merge: missing bubble timeline translations (!605) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/605
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> | 2024-10-03 17:30:01 +00:00 |  | 
				
					
						| 
								
								
									 CenTdemeern1 | 25e90f9c07 | Add JP localization for Show Below Avatar | 2024-10-03 19:29:38 +02:00 |  | 
				
					
						| 
								
								
									 dakkar | c85913d4b0 | nicer wordinc | 2024-10-03 16:59:37 +01:00 |  | 
				
					
						| 
								
								
									 Leah | 4281f08a75 | moved translation | 2024-10-03 16:59:07 +01:00 |  | 
				
					
						| 
								
								
									 Leah | d8474ceda5 | Fixed grammar | 2024-10-03 16:58:50 +01:00 |  | 
				
					
						| 
								
								
									 Leah | d55c86548d | You can now disable cat speak in settings (client side) | 2024-10-03 16:58:49 +01:00 |  | 
				
					
						| 
								
								
									 fEmber | e2beec33f8 | merge: Minor issue fixes on the frontend (!625) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/625
Closes #659, #656, #651, #661, #632, and #710
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com> | 2024-10-03 15:52:00 +00:00 |  | 
				
					
						| 
								
								
									 Hazel K | 72d59b459a | respect word mutes | 2024-10-03 00:45:49 -04:00 |  | 
				
					
						| 
								
								
									 CenTdemeern1 | 28aa99b273 | Implement "Show Below Avatar" for Avatar Decorations | 2024-10-02 23:49:30 +02:00 |  | 
				
					
						| 
								
								
									 Hazel K | 705ae79eb1 | Merge branch 'develop' into hazelnoot/following-timeline | 2024-10-02 11:45:09 -04:00 |  | 
				
					
						| 
								
								
									 Hazel K | 58080ad14f | add locale string "mutuals" | 2024-09-30 12:04:09 -04:00 |  | 
				
					
						| 
								
								
									 piuvas | de33ade423 | fix wording for the branding setting | 2024-09-29 11:45:35 -03:00 |  | 
				
					
						| 
								
								
									 piuvas | 4ac8e1bd52 | improve jp | 2024-09-22 17:36:56 -03:00 |  | 
				
					
						| 
								
								
									 piuvas | 4ee2973303 | requested fixes! | 2024-09-22 17:32:46 -03:00 |  | 
				
					
						| 
								
								
									 piuvas | d839c1eee1 | sidebarlogo localization | 2024-09-22 15:28:10 -03:00 |  | 
				
					
						| 
								
								
									 Esurio | 7aa956aca9 | fix: use i18n in settings | 2024-09-22 14:47:04 -03:00 |  | 
				
					
						| 
								
								
									 Esurio | cc51f7038e | fix: use i18n in settings | 2024-09-19 12:37:56 +00:00 |  | 
				
					
						| 
								
								
									 Marie | 9b7301fb2e | upd: Prompt for confirmation when Plugin:open_url is used | 2024-09-15 23:54:31 +02:00 |  | 
				
					
						| 
								
								
									 dakkar | 8822f7efda | fix Japanese "memo"→"note" | 2024-09-14 11:52:45 +01:00 |  | 
				
					
						| 
								
								
									 dakkar | a36a504a60 | fix Japanese spelling of "bubble" thanks to @esurio | 2024-09-14 11:01:59 +01:00 |  | 
				
					
						| 
								
								
									 Marie | 3a77ed5608 | merge: more pt-BR fixes! (!612) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/612
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> | 2024-09-13 16:01:37 +00:00 |  | 
				
					
						| 
								
								
									 piuvas | 625d856857 | more fixes | 2024-08-30 23:50:23 -03:00 |  | 
				
					
						| 
								
								
									 piuvas | 140b22ceca | pt-BR silliness | 2024-08-30 23:13:12 -03:00 |  | 
				
					
						| 
								
								
									 dakkar | 6151099f5b | Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.8 | 2024-08-30 12:08:31 +01:00 |  | 
				
					
						| 
								
								
									 dakkar | 87adf67752 | some maybe-not-terrible descriptions of the Bubble timeline the Japanese entries are translated by machine | 2024-08-25 15:23:33 +01:00 |  | 
				
					
						| 
								
								
									 dakkar | a99f99d798 | placeholders for the missing bubble bits | 2024-08-21 22:15:46 +01:00 |  | 
				
					
						| 
								
								
									 syuilo | f4f55ef012 | New translations ja-jp.yml (English) (#14432) | 2024-08-18 16:03:07 +09:00 |  | 
				
					
						| 
								
								
									 syuilo | 1629c0e50d | New Crowdin updates (#14426) * New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified) | 2024-08-18 10:11:50 +09:00 |  | 
				
					
						| 
								
								
									 syuilo | e790aa0548 | [skip ci] New Crowdin updates (#14423) * New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Simplified) | 2024-08-17 20:25:15 +09:00 |  |