zima 
								
							 
						 
						
							
							
							
							
								
							
							
								239393c64f 
								
							 
						 
						
							
							
								
								Merge tag '2024.11.2' into Chore-Update-upstream-to-2024.11.2  
							
							
							
						 
						
							2025-01-13 21:01:36 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zima 
								
							 
						 
						
							
							
							
							
								
							
							
								84f86f526d 
								
							 
						 
						
							
							
								
								Fix linting in MkEmojiPicker and custom-emojis in frontend  
							
							
							
						 
						
							2024-12-21 18:25:35 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HellhoundSoftware 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a6c345698 
								
							 
						 
						
							
							
								
								Improve emoticon picker UI  
							
							
							
						 
						
							2024-12-20 19:24:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HellhoundSoftware 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								38fec5f18f 
								
							 
						 
						
							
							
								
								Create CustomEmojiFolderTree nodes with correct path ( fixes   #25 )  
							
							
							
						 
						
							2024-12-20 19:24:49 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									HellhoundSoftware 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3731f3392 
								
							 
						 
						
							
							
								
								sort custom emoticons in picker by sortKey ( #18 )  
							
							
							
						 
						
							2024-12-20 19:24:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								12ef2b13c4 
								
							 
						 
						
							
							
								
								merge: avoid empty blocks when hiding ads ( !828 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/828 
Approved-by: Charlotte <timo.herngreen@gmail.com>
Approved-by: Amber Null <puppygirlhornyposting@gmail.com> 
							
						 
						
							2024-12-18 17:06:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								5fd3e271ac 
								
							 
						 
						
							
							
								
								only log preview error in dev mode  
							
							
							
						 
						
							2024-12-18 16:32:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								2dfadc082d 
								
							 
						 
						
							
							
								
								style embedded note previews like normal previews  
							
							... 
							
							
							
							and not like normal quotes 
							
						 
						
							2024-12-18 16:14:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								e9e2a5dd77 
								
							 
						 
						
							
							
								
								avoid empty blocks when hiding ads  
							
							... 
							
							
							
							2024.10 or 2024.11 added a `<div>` around `<MkAd>`, but while `MkAd`
checks if ads should be shown, and generates an empty `<div>` if not,
the wrapper `div` was always shown.
This commit takes the same logic from `MkAd` and applies it to the
wrapper as well.
thanks to @puppygirlhornypost for noticing 
							
						 
						
							2024-12-18 15:59:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								fb833d13cd 
								
							 
						 
						
							
							
								
								preview AP objects as quotes -  fix   #595  
							
							
							
						 
						
							2024-12-18 12:23:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								38d7faffdb 
								
							 
						 
						
							
							
								
								merge: make it harder to fumble opening a collapsed replied-to note ( !811 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/811 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2024-12-17 21:53:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e50ff9db6a 
								
							 
						 
						
							
							
								
								upd: make schedule time work cross timezones  
							
							
							
						 
						
							2024-12-15 22:41:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								e2352839e4 
								
							 
						 
						
							
							
								
								merge: upstream changes for 2024.11 ( !742 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/742 
Closes  #645  and #646 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2024-12-15 17:27:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dddfdf8a13 
								
							 
						 
						
							
							
								
								Add locales and new navbar entry  
							
							
							
						 
						
							2024-12-12 21:45:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								b266a5f9f6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/2024.10  
							
							
							
						 
						
							2024-12-12 17:38:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								9d76cc08cb 
								
							 
						 
						
							
							
								
								merge: Fixed  Emoji in usernames of profile's owner not visible in the Pages and Plays tabs ( resolves   #829 ) ( !814 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/814 
Closes  #829 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com> 
							
						 
						
							2024-12-12 13:50:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Leah 
								
							 
						 
						
							
							
							
							
								
							
							
								d1fe3da4b8 
								
							 
						 
						
							
							
								
								remove old unused imports  
							
							
							
						 
						
							2024-12-12 14:38:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								943c6414d8 
								
							 
						 
						
							
							
								
								merge: Enable by default and federate "hide online status" ( resolves   #823 ) ( !807 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/807 
Closes  #823 
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net> 
							
						 
						
							2024-12-12 13:08:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								bdb00fcaf2 
								
							 
						 
						
							
							
								
								update css variable references  
							
							
							
						 
						
							2024-12-12 13:07:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								6d4ae93592 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/2024.10  
							
							
							
						 
						
							2024-12-12 13:04:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Leah 
								
							 
						 
						
							
							
							
							
								
							
							
								b2387cbfef 
								
							 
						 
						
							
							
								
								Fixed  Emoji in usernames of profile's owner not visible in the Pages and Plays tabs  
							
							
							
						 
						
							2024-12-12 14:00:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								8eb9c20df7 
								
							 
						 
						
							
							
								
								merge: Schedule Notes ( !804 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/804 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com> 
							
						 
						
							2024-12-12 12:50:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								0ebdf91b28 
								
							 
						 
						
							
							
								
								fix pleaseLogin on *NoteSub  
							
							... 
							
							
							
							we really need to factor these things out 
							
						 
						
							2024-12-12 10:04:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								5ae409b032 
								
							 
						 
						
							
							
								
								make it harder to fumble opening a collapsed replied-to note  
							
							... 
							
							
							
							clicking on the username of the collapsed replied-to note, opens the
note instead of navigating to the user's profile
clicking the avatar still goes to the profile 
							
						 
						
							2024-12-11 09:52:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								d6297f2035 
								
							 
						 
						
							
							
								
								merge: Fix: scrolling alt text using a mouse ( !810 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/810 
Closes  #654 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2024-12-10 15:44:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								5cc77b64bf 
								
							 
						 
						
							
							
								
								Fix scrolling alt text using a mouse  
							
							... 
							
							
							
							Co-authored-by: BlankEclair <blankeclair@disroot.org> 
							
						 
						
							2024-12-10 15:12:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bf01dcd8fb 
								
							 
						 
						
							
							
								
								Apply suggestions  
							
							
							
						 
						
							2024-12-09 18:58:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								b7a6ccfef9 
								
							 
						 
						
							
							
								
								enable hideOnlineStatus by default for new users  
							
							
							
						 
						
							2024-12-09 09:29:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Caramel 
								
							 
						 
						
							
							
							
							
								
							
							
								bb12109bc4 
								
							 
						 
						
							
							
								
								Make collapsed notes subscribe to stream  
							
							... 
							
							
							
							Previously, when the note was collapsed, it didn't get updates such
as reactions from streaming server. This was a problem, as any change
made to the post before it got uncollapsed would end up being ignored. 
							
						 
						
							2024-12-09 11:41:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								3d1e35c9b8 
								
							 
						 
						
							
							
								
								fix a bunch of CSS variables  
							
							
							
						 
						
							2024-12-09 09:41:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								234d14a892 
								
							 
						 
						
							
							
								
								Revert import order update caused by saving  
							
							
							
						 
						
							2024-12-09 05:21:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dda922a030 
								
							 
						 
						
							
							
								
								remove splatting  
							
							
							
						 
						
							2024-12-09 06:15:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								116a147202 
								
							 
						 
						
							
							
								
								remove comma added by vscode prettifer  
							
							
							
						 
						
							2024-12-09 05:00:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								152cc07483 
								
							 
						 
						
							
							
								
								Apply suggestions  
							
							
							
						 
						
							2024-12-09 05:58:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b10eb7ada9 
								
							 
						 
						
							
							
								
								fix missing imports  
							
							
							
						 
						
							2024-12-09 05:33:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7eb0996b60 
								
							 
						 
						
							
							
								
								upd: use apiWithDialog instead of misskeyApi  
							
							
							
						 
						
							2024-12-09 05:33:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3efb99dd57 
								
							 
						 
						
							
							
								
								fix: missing MKButton import  
							
							
							
						 
						
							2024-12-09 05:33:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1d3c825398 
								
							 
						 
						
							
							
								
								upd: add notification for when scheduled note gets posted  
							
							
							
						 
						
							2024-12-09 05:33:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fc9d777dc3 
								
							 
						 
						
							
							
								
								upd: add notification for failures, add reasons for failure, apply suggestions  
							
							
							
						 
						
							2024-12-09 05:32:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f08d1ec38f 
								
							 
						 
						
							
							
								
								chore: remove leftover log  
							
							
							
						 
						
							2024-12-09 05:32:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f58b8de20 
								
							 
						 
						
							
							
								
								fix: drive content not being loaded  
							
							
							
						 
						
							2024-12-09 05:31:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									NoriDev 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2528508cff 
								
							 
						 
						
							
							
								
								feat: 노트 게시를 예약할 수 있음 ( yojo-art/cherrypick#483 , [ Type4ny-Project/Type4ny@271c872c ]( 271c872c97))  
							
							
							
						 
						
							2024-12-09 05:31:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								9937ff39be 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/2024.10  
							
							
							
						 
						
							2024-12-08 19:03:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								15ecc8f86d 
								
							 
						 
						
							
							
								
								Always use ruffle even if flash is installed  
							
							... 
							
							
							
							This is for the sake of safety 
							
						 
						
							2024-12-08 19:16:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								f258b074b7 
								
							 
						 
						
							
							
								
								Disable networking  
							
							
							
						 
						
							2024-12-08 19:16:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								c93a1b2d08 
								
							 
						 
						
							
							
								
								Fix issues caused by reactivity removal  
							
							
							
						 
						
							2024-12-08 19:16:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								523cc67c14 
								
							 
						 
						
							
							
								
								Remove computed  
							
							
							
						 
						
							2024-12-08 19:16:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								034682f7ac 
								
							 
						 
						
							
							
								
								Add _RUFFLE_VERSION_ global Vite define  
							
							
							
						 
						
							2024-12-08 19:16:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								32654c7153 
								
							 
						 
						
							
							
								
								Use new --MI and --MI_THEME  
							
							
							
						 
						
							2024-12-08 19:16:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								a6a78d35a7 
								
							 
						 
						
							
							
								
								Download with the correct filename  
							
							
							
						 
						
							2024-12-08 19:15:41 +01:00