Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								d8908ef2d8 
								
							 
						 
						
							
							
								
								merge upstream  
							
							
							
						 
						
							2025-03-25 16:14:53 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ffd8cf07e6 
								
							 
						 
						
							
							
								
								update deps ( #15311 )  
							
							... 
							
							
							
							* wip
* bump misskey-dev/eslint-plugin
* lint fixes (backend)
* lint fixes (frontend)
* lint fixes (frontend-embed)
* rollback nsfwjs to 4.2.0
ref: infinitered/nsfwjs#904 
* rollback openapi-typescript to v6
v7でOpenAPIのバリデーションが入るようになった関係でスコープ外での変更が避けられないため一時的に戻した
* lint fixes (misskey-js)
* temporarily disable errored lint rule (frontend-shared)
* fix lint
* temporarily ignore errored file for lint (frontend-shared)
* rollback simplewebauthn/server to 12.0.0
v13 contains breaking changes that require some decision making
* lint fixes (frontend-shared)
* build misskey-js with types
* fix(backend): migrate simplewebauthn/server to v12
* fix(misskey-js/autogen): ignore indent rules to generate consistent output
* attempt to fix test
changes due to capricorn86/happy-dom#1617  (XMLSerializer now produces valid XML)
* attempt to fix test
changes due to capricorn86/happy-dom#1617  (XMLSerializer now produces valid XML)
* fix test
* fix test
* fix test
* Apply suggestions from code review
Co-authored-by: anatawa12 <anatawa12@icloud.com>
* bump summaly to v5.2.0
* update tabler-icons to v3.30.0-based
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: anatawa12 <anatawa12@icloud.com> 
							
						 
						
							2025-02-15 10:24:22 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								d426e2a7ef 
								
							 
						 
						
							
							
								
								fix our ruby/group hack  
							
							
							
						 
						
							2025-02-07 18:22:45 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								a4e86758c1 
								
							 
						 
						
							
							
								
								merge upstream 2025-02-03  
							
							
							
						 
						
							2025-02-03 14:36:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								408e2f824a 
								
							 
						 
						
							
							
								
								format ruby for masto api  
							
							
							
						 
						
							2025-01-19 11:16:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								01a5300be8 
								
							 
						 
						
							
							
								
								handle more complex ruby from/to html -  fixes   #605  
							
							... 
							
							
							
							this is not exactly great, but it should be "good enough"
note that the new `group` function should not escape in the wild, as
we don't document it and only use it internally
I tried using `$[scale foo bar]` instead of `$[group foo bar]`, but
that would be rendered as `<i>foo bar</i>` when sent over the network
to non-misskey instances, and we don't want that 
							
						 
						
							2025-01-18 12:51:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hong Minhee (洪 民憙) 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d018fe58aa 
								
							 
						 
						
							
							
								
								fix(backend): Let MfmService.fromHtml accept ruby ( #15117 )  
							
							... 
							
							
							
							This fix makes `MfmService.fromHtml()` method accept `<ruby>` tags
and translate it to MFM's ruby characters syntax (`$[ruby ...]`).
このパッチは`MfmService.fromHtml()`メソッドが`<ruby>`タグをMFMの
読み仮名(ルビ)文法に翻訳する様に修正します。 
							
						 
						
							2025-01-14 13:06:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								451b0ecc9b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'misskey/release/2024.5.0' into future-2024-04-25-post  
							
							
							
						 
						
							2024-05-11 14:13:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ikasoba 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20eb4bc296 
								
							 
						 
						
							
							
								
								Fix(backend): ActivityPubでのHTMLへのシリアライズを修正 ( #13752 )  
							
							... 
							
							
							
							* devモードでもActivityPub系エンドポイントへアクセスできるように
* ActivityPubでのHTMLのシリアライズを修正
* ハードコードしていたurlを`httpUrl`へ修正
* テストの追加 
							
						 
						
							2024-04-27 20:26:55 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								10bfc61670 
								
							 
						 
						
							
							
								
								merge: upstream  
							
							
							
						 
						
							2024-02-19 10:47:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tamaina 
								
							 
						 
						
							
							
							
							
								
							
							
								c1514ce91d 
								
							 
						 
						
							
							
								
								(re)  update SPDX-FileCopyrightText  
							
							... 
							
							
							
							Fix  #13290  
							
						 
						
							2024-02-13 15:59:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tamaina 
								
							 
						 
						
							
							
							
							
								
							
							
								311c2172d7 
								
							 
						 
						
							
							
								
								Revert "update SPDX-FileCopyrightText"  
							
							... 
							
							
							
							This reverts commit 9b5aeb76d8 
							
						 
						
							2024-02-13 15:50:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								9b5aeb76d8 
								
							 
						 
						
							
							
								
								update SPDX-FileCopyrightText  
							
							
							
						 
						
							2024-02-12 11:37:45 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af5ebdfced 
								
							 
						 
						
							
							
								
								merge: more upstream changes  
							
							
							
						 
						
							2024-02-07 21:52:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MeiMei 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e89d760240 
								
							 
						 
						
							
							
								
								Enhance: 連合向けのノート配信を軽量化 ( #13192 )  
							
							... 
							
							
							
							* AP HTML表現をシンプルに
* a
* CHANGELOG
* リンク 
							
						 
						
							2024-02-07 19:57:59 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f091b84c6e 
								
							 
						 
						
							
							
								
								chore: change sfm registry and name  
							
							
							
						 
						
							2024-02-03 15:01:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								c92c2d065f 
								
							 
						 
						
							
							
								
								upd: replace mfm with sfm  
							
							
							
						 
						
							2023-12-18 03:03:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shun Sakai 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c2370a1be6 
								
							 
						 
						
							
							
								
								chore: 著作権とライセンスについての情報を各ファイルに追加する ( #11348 )  
							
							... 
							
							
							
							* chore: Add the SPDX information to each file
Add copyright and licensing information as defined in version 3.0 of
the REUSE Specification.
* tweak format
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> 
							
						 
						
							2023-07-27 14:31:52 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								3bb7afe544 
								
							 
						 
						
							
							
								
								improve performance of some tests  
							
							
							
						 
						
							2023-02-22 15:16:29 +09:00