Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								28551c8103 
								
							 
						 
						
							
							
								
								use config.url instead of " https://${config.host} "  
							
							
							
						 
						
							2025-05-21 08:27:23 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								ac894986f9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2025-03-24  
							
							... 
							
							
							
							# Conflicts:
#	CONTRIBUTING.md
#	packages/backend/src/core/activitypub/models/ApPersonService.ts 
							
						 
						
							2025-04-24 13:07:41 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								4f64803ef2 
								
							 
						 
						
							
							
								
								merge: make MOTD html unescaped. (requires discussion?) ( !759 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/759 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-04-15 07:45:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								91fb75dece 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2025-03-24  
							
							
							
						 
						
							2025-04-13 13:07:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Zlendy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce26d8d3cb 
								
							 
						 
						
							
							
								
								feat: Allow injection of raw HTML strings inside <head>  
							
							
							
						 
						
							2025-04-11 22:56:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								d39e4babd1 
								
							 
						 
						
							
							
								
								fix development link in error.pug  
							
							
							
						 
						
							2025-04-01 12:29:08 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								d8908ef2d8 
								
							 
						 
						
							
							
								
								merge upstream  
							
							
							
						 
						
							2025-03-25 16:14:53 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22228b6756 
								
							 
						 
						
							
							
								
								enhance: OAuth2 (IndieAuth) でロゴが提供されている場合は表示するように ( #15578 )  
							
							... 
							
							
							
							* enhance: OAuthでロゴが提供されている場合は表示するように
* Update Changelog
* refactor
* fix
* fix test 
							
						 
						
							2025-03-06 08:05:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b44954dcb 
								
							 
						 
						
							
							
								
								enhance(frontend): サーバーエラー画面の多言語対応 ( #15549 )  
							
							... 
							
							
							
							* enhance(frontend): サーバーエラー画面の多言語対応
* indent 
							
						 
						
							2025-02-24 05:23:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								eb25238a8e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/2024.10  
							
							
							
						 
						
							2024-11-28 11:17:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								1626e50fbf 
								
							 
						 
						
							
							
								
								expose video thumbnail to 3rd parties "cards"  
							
							
							
						 
						
							2024-11-27 11:23:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								bc816cb166 
								
							 
						 
						
							
							
								
								Merge tag '2024.11.0' into feature/2024.10  
							
							
							
						 
						
							2024-11-22 12:29:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0c3a4cc0b 
								
							 
						 
						
							
							
								
								perf(frontend): reduce api requests for non-logged-in enviroment ( #15001 )  
							
							... 
							
							
							
							* wip
* Update CHANGELOG.md
* wip 
							
						 
						
							2024-11-21 07:58:34 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									piuvas 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								878e2f46fa 
								
							 
						 
						
							
							
								
								unescape MOTD html  
							
							
							
						 
						
							2024-11-20 13:42:23 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e75b62f3f5 
								
							 
						 
						
							
							
								
								enhance(frontend): 個別お知らせページではmetaタグを出力するように ( #14902 )  
							
							... 
							
							
							
							* enhance(frontend): 個別お知らせページではmetaタグを出力するように
* Update Changelog 
							
						 
						
							2024-11-09 10:53:09 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								a12815eabe 
								
							 
						 
						
							
							
								
								fix some (all?) Misskey references  
							
							
							
						 
						
							2024-10-11 09:59:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								671d71b3ba 
								
							 
						 
						
							
							
								
								probably use correct icons in embeds  
							
							
							
						 
						
							2024-10-09 17:24:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								5856858f49 
								
							 
						 
						
							
							
								
								try to fix icons  
							
							
							
						 
						
							2024-10-09 15:52:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								f00576bce6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'misskey/master' into feature/2024.9.0  
							
							
							
						 
						
							2024-10-09 15:17:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aee984813d 
								
							 
						 
						
							
							
								
								fix(backend): embedの動作に必要な値を復活させる ( #14633 )  
							
							
							
						 
						
							2024-09-25 19:27:50 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f0aaaa41e 
								
							 
						 
						
							
							
								
								perf(embed): improve embed performance ( #14613 )  
							
							... 
							
							
							
							* wip
* wip
* wip
* refactor
* refactor
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> 
							
						 
						
							2024-09-23 19:49:52 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2cbe1d1210 
								
							 
						 
						
							
							
								
								feat(frontend): ノート・ユーザータイムライン埋め込み ( #13929 )  
							
							... 
							
							
							
							* fix
* navhookをbootに移動
* サーバーサイドのbootも分けるように
* 埋め込みページかどうかの判定は最初の一回だけに
* tooltipは出せるように
* fix design
* 埋め込み独自のtooltipを削除
* ロジックの分岐が多かったMkNoteDetailedを分離
* fix indent
* プレビュー用iframeにフォーカスが当たるのを修正
* popupの制御を出す側で行うように
* パラメータが逆になっていたのを修正
* Update MkEmbedCodeGenDialog.vue
* fix
* eliminate misskey-js lint warns
* fix
* add appropriate attributes to embed html
* enhance: サーバーサイドのembed系をさらに分離
* enhance: embed routerを分離(route定義をboot時に変更できるようにする改修を含む)
* type
* lint
* fix indent
* server-side styleを完全に分離
* Revert "refactor: 画面サイズのしきい値をconstにまとめる"
This reverts commit 05ca36f400889456981e89489ae0ae242fa09b67.
* fix
* revert all changes in base.pug
* embedドメインをまとめた
* embedドメインをまとめた
* prevent calling contextmenu in embed page by stopping at the caller
* fix import
* fix import
* improve directory structure
* fix import
* register timeline ui as a container
* wa-
* rename
* wa-
* Update EmMediaList.vue
* Update EmMediaList.vue
* Update EmMediaList.vue
* Update EmMediaImage.vue
* Update EmNote.vue
* revert mkmedialist changes
* 戻し漏れ
* wip
* tweak embed media ui
* revert original media components
* Update boot.embed.js
* rename
* wip
* Update MkNote.vue
* wip
* Update MkSubNoteContent.vue
* Update EmNote.vue
* Update packages/frontend/src/router/definition.ts
* Revert "Update packages/frontend/src/router/definition.ts"
This reverts commit 937ae44521cdb0f250796943b20142b65f8ed944.
* refactor EmMediaImage
* fix import
* remove unused imports
* Update router.ts
* wip
* Update boot.ts
* wip
* wip
* wip
* wip
* Update EmNote.vue
* Update EmNote.vue
* Create EmA.vue
* Create EmAvatar.vue
* Update EmAvatar.vue
* wip
* wip
* wip
* Create EmImgWithBlurhash.vue
* Update EmImgWithBlurhash.vue
* Create EmPagination.vue
* wip
* Update boot.ts
* wip
* wip
* wi@p
* wip
* wip
* wiop
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Update boot.ts
* wip
* Update MkMisskeyFlavoredMarkdown.ts
* wip
* wip
* wip
* wip
* wip
* Update post-message.ts
* wip
* Update EmNoteDetailed.vue
* Update EmNoteDetailed.vue
* Create instance.ts
* Update EmNoteDetailed.vue
* wip
* Update EmNoteDetailed.vue
* wip
* wip
* wip
* Update pnpm-lock.yaml
* wip
* wip
* wp
* wip
* Update ClientServerService.ts
* wip
* Update boot.ts
* Update vite.config.local-dev.ts
* Update vite.config.ts
* Create index.html
* wa-
* wip
* Update boot.ts
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Create EmLink.vue
* Create EmMention.vue
* Update EmMfm.ts
* wip
* wip
* wip
* wip
* Update vite.config.ts
* Update boot.ts
* Update EmA.vue
* うぃp
* wip
* wip
* Create EmError.vue
* wip
* Update MkEmbedCodeGenDialog.vue
* Update EmNote.vue
* wip
* wip
* Update user-timeline.vue
* Update check-spdx-license-id.yml
* wip
* wip
* style(frontend-shared): lint fixes on build.js
* fix(frontend-shared): include `*.{js,json}` files in js-built
* wip
* use alias
* refactor
* refactor
* Update scroll.ts
* refactor
* refactor
* refactor
* wip
* wip
* wip
* wip
* Update roles.vue
* Update branding.vue
* wip
* wip
* wip
* Update page.vue
* wip
* fix import
* add missing css variables
* 絵文字をtwemojiに変更
クライアントデフォルトにあわせるため
* force empoll readonly
* fix compiler error
* fix broken imports
* tweak button style
* run api extractor
* fix storybook theme preloads
* fix storybook instance imports
* Update preview.ts
* Update preview.ts
* Update preview.ts
* Revert "Update preview.ts"
This reverts commit 12bab1c6fbd3baf753515df760ff19d027b85155.
* Revert "Update preview.ts"
This reverts commit 5c0ce01dbdf2194ffe94aba950f747a9968f29c4.
* Revert "Update preview.ts"
This reverts commit f4863524d7e5ca0f25470808849c24a72bea000a.
* Revert "fix storybook instance imports"
This reverts commit ed8eabb246edf731d31adffbe3c77c539e53ae9e.
* Revert "wip"
This reverts commit d3c1926519878155193a1654f49141e515d49683.
* Revert "Update page.vue"
This reverts commit 27c7900b0c1ae296b56075e8a9c22585d9cd744b.
* Revert "Update branding.vue"
This reverts commit c08ccb65ba66774c3e2b3dcfc6153004b5c0aa16.
* Revert "Update roles.vue"
This reverts commit 1488b670660cb1803d17d8f5c78f2d79e59fa52d.
* Revert "wip"
This reverts commit aab1c769814b08c257cad3025422a0eea3bfba4f.
* refactor: use common media proxy
* fix imports
* fix
* fix: MediaProxyの初期化を保証する(storybook対策?)
* enhance(frontend-embed): improve embedParams provide
* fix(backend): MK_DEV_PREFER=backendのときにembed viteが読み込めないのを修正
* fix
* embed-pageを共通化
* fix import
* fix import
* fix import
* const.jsを共通化
(たぶんrevertしすぎた)
* fix type error
* fix duplicated import
* fix lint
* fix
* コメントとして残す
* sharedとembedをlint対象にする
* lint
* attempt to fix eslint (frontend-shared)
* lint fixes
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com> 
							
						 
						
							2024-09-09 20:57:36 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								6151099f5b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.8  
							
							
							
						 
						
							2024-08-30 12:08:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								b6fdd71957 
								
							 
						 
						
							
							
								
								消し忘れ  
							
							
							
						 
						
							2024-08-27 20:40:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb10156f01 
								
							 
						 
						
							
							
								
								fix(frontend): iOSでacctなどがリンクとして誤検知されるのを抑制 ( #14354 )  
							
							... 
							
							
							
							* fix(frontend): iosでの自動リンク化を抑制
* Update Changelog
* typo
* typo
* Update CHANGELOG.md 
							
						 
						
							2024-08-10 20:46:26 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								6d1b1df1aa 
								
							 
						 
						
							
							
								
								cache-bursting for stylesheets and fonts  
							
							... 
							
							
							
							adding `?version=…` makes sure browsers get the latest files, and it
looks like they honour the caching headers we send back 
							
						 
						
							2024-06-19 17:04:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								3372e0ffe1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'misskey/release/2024.5.0' into future  
							
							
							
						 
						
							2024-05-31 12:26:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									anatawa12 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bde630820 
								
							 
						 
						
							
							
								
								/tags と /user-tags が検索エンジンにインデックスされないように (#13847 )  
							
							... 
							
							
							
							* chore(backend): noindex for tag search pages
* docs(changelog): `/tags` と `/user-tags` が検索エンジンにインデックスされないように
* chore: base.pug内でフラグでコントロールするように 
							
						 
						
							2024-05-21 11:19:33 +09: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2b21c19362 
								
							 
						 
						
							
							
								
								update deps ( #13624 )  
							
							... 
							
							
							
							* update deps
* Update package.json
* update deps
* build: pass --strip-leading-paths to restore 0.2.x behavior (#13684 )
* ✌️ 
* ✌️ 
* pureimageの代わりに@napi-rs/canvasを使う (#13748 )
* pureimageの代わりに@napi-rs/canvasを使う
* remove writestream
* remove createtemp
* wip
* Update ClientServerService.ts
* update pnpm to 9.x
* update deps
* re: update pnpm to 9.x
* update node
* ✌️ 
---------
Co-authored-by: anatawa12 <anatawa12@icloud.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp> 
							
						 
						
							2024-05-04 20:56:14 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb5d8bdcdd 
								
							 
						 
						
							
							
								
								fix(backend): ページのOGP URLが違うのを修正 ( #13749 )  
							
							... 
							
							
							
							* fix(backend): ページのOGP URLが違うのを修正
* Update Changelog
* typo 
							
						 
						
							2024-04-27 18:53:28 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								ea6629cebf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into future-2024-04-10-post  
							
							
							
						 
						
							2024-04-25 11:18:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								a58f4a6fed 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into future-2024-03-23-post  
							
							
							
						 
						
							2024-04-11 13:22:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								56dca6dbf5 
								
							 
						 
						
							
							
								
								hide images/videos in og cards, when under a CW -  fixes   #487  
							
							
							
						 
						
							2024-04-07 16:58:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								bc531ac414 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'misskey/develop' into future-2024-03-23  
							
							
							
						 
						
							2024-03-24 11:53:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0226a670dd 
								
							 
						 
						
							
							
								
								fix(backend): ユーザーやノートのOGPでローカルとリモートユーザーの見分けが付かない問題を修正 ( #13586 )  
							
							... 
							
							
							
							* enhance(OGP): ユーザーやノートのOGPでローカルとリモートユーザーの見分けが付かない問題を修正 (MisskeyIO#528)
(cherry picked from commit 0c3de462d99c47297bebc162581bac6f78f21b49)
* Update Changelog
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> 
							
						 
						
							2024-03-18 18:34:31 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alina Sireneva 
								
							 
						 
						
							
							
							
							
								
							
							
								0085305579 
								
							 
						 
						
							
							
								
								fix: load libopenmpt on demand  
							
							
							
						 
						
							2024-03-11 15:32:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15d2319011 
								
							 
						 
						
							
							
								
								merge: upstream  
							
							
							
						 
						
							2024-02-23 13:42:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d20542c495 
								
							 
						 
						
							
							
								
								enhance: metaをSSR HTMLに埋め込む ( #13436 )  
							
							... 
							
							
							
							* enhance: `meta`をSSR HTMLに埋め込む
* HTML Metaの有効時間を指定
* 1時間
* MetaEntityService
* JSONをPackするように
* ✌️ 
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> 
							
						 
						
							2024-02-23 10:47:17 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d182402cfa 
								
							 
						 
						
							
							
								
								fix: icons and update urls  
							
							
							
						 
						
							2024-02-19 18:46:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fd69a2fbbd 
								
							 
						 
						
							
							
								
								merge: upstream  
							
							
							
						 
						
							2024-01-22 19:58:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								5c8888d6a8 
								
							 
						 
						
							
							
								
								enhance(reversi): render ogp  
							
							
							
						 
						
							2024-01-22 17:59:12 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								e0155cffae 
								
							 
						 
						
							
							
								
								add: Custom MOTDs  
							
							... 
							
							
							
							This works almost exactly like FF's custom MOTDs with the only difference being that they get defined in the config file for performance reasons.
Closes  #86  
							
						 
						
							2023-12-22 13:10:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								aedc1d0ee9 
								
							 
						 
						
							
							
								
								update deps  
							
							
							
						 
						
							2023-12-14 13:22:12 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Insert5StarName 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								702fc6b6f7 
								
							 
						 
						
							
							
								
								chore: update repo links  
							
							
							
						 
						
							2023-12-09 03:02:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mar0xy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62d1cb490b 
								
							 
						 
						
							
							
								
								add: custom icon font  
							
							
							
						 
						
							2023-12-05 22:20:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mar0xy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								42bf8e5e76 
								
							 
						 
						
							
							
								
								merge: upstream  
							
							
							
						 
						
							2023-11-22 23:40:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mar0xy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d94b1c3fe0 
								
							 
						 
						
							
							
								
								chore: lint  
							
							
							
						 
						
							2023-11-09 15:07:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mar0xy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								885800ee5e 
								
							 
						 
						
							
							
								
								revert: deletion of oauth.pug  
							
							
							
						 
						
							2023-11-09 15:06:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mar0xy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fdb36f1d96 
								
							 
						 
						
							
							
								
								fix: oauth/authorize and token showing error page  
							
							
							
						 
						
							2023-11-09 15:00:38 +01:00