Hazelnoot
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e4ec0dd9e
								
							
						 | 
						
							
							
								
								add role policy to allow note trending
							
							
							
							
							
						 | 
						
							2025-05-14 23:24:24 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marie
								
							 
						 | 
						
							
							
							
							
								
							
							
								69448c0204
								
							
						 | 
						
							
							
								
								fix incorrect file extension for error image
							
							
							
							
							
						 | 
						
							2025-05-03 11:49:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazelnoot
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c301fa5aa
								
							
						 | 
						
							
							
								
								Merge branch 'misskey-develop' into merge/2025-03-24
							
							
							
							
							
							
							
							# Conflicts:
#	.github/workflows/api-misskey-js.yml
#	.github/workflows/changelog-check.yml
#	.github/workflows/check-misskey-js-autogen.yml
#	.github/workflows/get-api-diff.yml
#	.github/workflows/lint.yml
#	.github/workflows/locale.yml
#	.github/workflows/on-release-created.yml
#	.github/workflows/storybook.yml
#	.github/workflows/test-backend.yml
#	.github/workflows/test-federation.yml
#	.github/workflows/test-frontend.yml
#	.github/workflows/test-misskey-js.yml
#	.github/workflows/test-production.yml
#	.github/workflows/validate-api-json.yml
#	package.json
#	packages/backend/package.json
#	packages/backend/src/server/api/ApiCallService.ts
#	packages/backend/src/server/api/endpoints/drive/files/create.ts
#	packages/frontend-shared/js/url.ts
#	packages/frontend/package.json
#	packages/frontend/src/components/MkFileCaptionEditWindow.vue
#	packages/frontend/src/components/MkInfo.vue
#	packages/frontend/src/components/MkLink.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNotes.vue
#	packages/frontend/src/components/MkPageWindow.vue
#	packages/frontend/src/components/MkReactionsViewer.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/components/MkUrlPreview.vue
#	packages/frontend/src/components/MkUserPopup.vue
#	packages/frontend/src/components/global/MkPageHeader.vue
#	packages/frontend/src/components/global/MkUrl.vue
#	packages/frontend/src/components/global/PageWithHeader.vue
#	packages/frontend/src/pages/about-misskey.vue
#	packages/frontend/src/pages/announcements.vue
#	packages/frontend/src/pages/antenna-timeline.vue
#	packages/frontend/src/pages/channel.vue
#	packages/frontend/src/pages/instance-info.vue
#	packages/frontend/src/pages/note.vue
#	packages/frontend/src/pages/page.vue
#	packages/frontend/src/pages/role.vue
#	packages/frontend/src/pages/tag.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user-list-timeline.vue
#	packages/frontend/src/pages/user/followers.vue
#	packages/frontend/src/pages/user/following.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/pages/user/index.vue
#	packages/frontend/src/ui/deck.vue
#	packages/misskey-js/generator/package.json
#	pnpm-lock.yaml
#	scripts/changelog-checker/package-lock.json
#	scripts/changelog-checker/package.json 
							
						 | 
						
							2025-04-29 15:54:11 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									syuilo
								
							 
						 | 
						
							
							
							
							
								
							
							
								9481b5a6e8
								
							
						 | 
						
							
							
								
								feat: アップロード可能な最大ファイルサイズをロールごとに設定可能に
							
							
							
							
							
						 | 
						
							2025-04-27 09:35:44 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazelnoot
								
							 
						 | 
						
							
							
							
							
								
							
							
								7132696285
								
							
						 | 
						
							
							
								
								Merge tag '2025.4.0' into merge/2025-03-24
							
							
							
							
							
							
							
							# Conflicts:
#	.github/workflows/storybook.yml
#	locales/index.d.ts
#	package.json
#	packages/backend/src/models/json-schema/role.ts
#	packages/frontend/src/components/MkPageWindow.vue
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/admin/roles.vue
#	packages/frontend/src/pages/settings/preferences.vue
#	packages/frontend/src/pages/settings/privacy.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pref-migrate.ts
#	packages/frontend/src/ui/_common_/common.vue
#	packages/frontend/src/ui/deck.vue
#	packages/frontend/src/ui/universal.vue
#	packages/misskey-js/src/autogen/types.ts 
							
						 | 
						
							2025-04-13 13:07:09 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									かっこかり
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9d3f3264fd
								
							
						 | 
						
							
							
								
								enhance: チャットの閲覧を無効化できるように (#15765)
							
							
							
							
							
							
							
							* enhance: チャットの閲覧を無効化できるように
* fix
* fix
* fix
* readonlyの説明を追加
* enhance: チャットが無効な場合はチャット関連の設定も隠すように
* fix
* refactor: ChatServiceからApiに関するドメイン知識を排除 
							
						 | 
						
							2025-04-07 19:09:11 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazelnoot
								
							 
						 | 
						
							
							
							
							
								
							
							
								40975719ec
								
							
						 | 
						
							
							
								
								Merge branch 'misskey-develop' into merge/2025-03-24
							
							
							
							
							
							
							
							# Conflicts:
#	package.json
#	packages/backend/src/core/entities/NotificationEntityService.ts
#	packages/backend/src/types.ts
#	packages/frontend/src/pages/admin/modlog.ModLog.vue
#	packages/misskey-js/src/consts.ts
#	packages/misskey-js/src/entities.ts 
							
						 | 
						
							2025-03-25 16:17:34 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazelnoot
								
							 
						 | 
						
							
							
							
							
								
							
							
								d8908ef2d8
								
							
						 | 
						
							
							
								
								merge upstream
							
							
							
							
							
						 | 
						
							2025-03-25 16:14:53 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									syuilo
								
							 
						 | 
						
							
							
							
							
								
							
							
								304d0eb83b
								
							
						 | 
						
							
							
								
								enhance: チャットルームに招待されたときの通知を追加
							
							
							
							
							
						 | 
						
							2025-03-25 15:25:43 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									syuilo
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f1f24e39d2
								
							
						 | 
						
							
							
								
								Feat: Chat (#15686)
							
							
							
							
							
							
							
							* wip
* wip
* wip
* wip
* wip
* wip
* Update types.ts
* Create 1742203321812-chat.js
* wip
* wip
* Update room.vue
* Update home.vue
* Update home.vue
* Update ja-JP.yml
* Update index.d.ts
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Update CHANGELOG.md
* wip
* Update home.vue
* clean up
* Update misskey-js.api.md
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* lint fixes
* lint
* Update UserEntityService.ts
* search
* wip
* 🎨
* wip
* Update home.ownedRooms.vue
* wip
* Update CHANGELOG.md
* Update style.scss
* wip
* improve performance
* improve performance
* Update timeline.test.ts 
							
						 | 
						
							2025-03-24 21:32:46 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									syuilo
								
							 
						 | 
						
							
							
							
							
								
							
							
								0471e457fe
								
							
						 | 
						
							
							
								
								fix(frontend): fix broken styles
							
							
							
							
							
						 | 
						
							2025-03-23 21:23:52 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lqvp
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e339293673
								
							
						 | 
						
							
							
								
								feat: アクセストークン発行時に通知するように (#15422)
							
							
							
							
							
							
							
							* feat: アクセストークン発行時に通知するように (misskey-dev/misskey#13353)
* fix: 不要な翻訳を削除/インデントを揃えるように
* chore(backend): 不要なawaitを削除
* chore: changelogへ追加 
							
						 | 
						
							2025-02-11 01:15:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dakkar
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d4ae93592
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/2024.10
							
							
							
							
							
						 | 
						
							2024-12-12 13:04:51 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
							
							
								
							
							
								6aa4727d1d
								
							
						 | 
						
							
							
								
								feat: Flash playback using Ruffle
							
							
							
							
							
							
							
							Still a work in progress. 
							
						 | 
						
							2024-12-08 19:15:40 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dakkar
								
							 
						 | 
						
							
							
							
							
								
							
							
								f079edaf3c
								
							
						 | 
						
							
							
								
								Merge tag '2024.10.1' into feature/2024.10
							
							
							
							
							
						 | 
						
							2024-11-08 15:52:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hazelnoot
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e220d6e31
								
							
						 | 
						
							
							
								
								fix lint error in const.ts
							
							
							
							
							
						 | 
						
							2024-10-15 21:22:46 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marie
								
							 
						 | 
						
							
							
							
							
								
							
							
								464fb22710
								
							
						 | 
						
							
							
								
								fix: accidental double backslash in DEFAULT_INFO_IMAGE_URL
							
							
							
							
							
						 | 
						
							2024-10-12 11:41:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marie
								
							 
						 | 
						
							
							
							
							
								
							
							
								f68c0ac05d
								
							
						 | 
						
							
							
								
								fix: broken error images
							
							
							
							
							
						 | 
						
							2024-10-11 22:06:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dakkar
								
							 
						 | 
						
							
							
							
							
								
							
							
								f00576bce6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
							
							
							
							
							
						 | 
						
							2024-10-09 15:17:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									syuilo
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								83db116c46
								
							
						 | 
						
							
							
								
								enhance(backend): notify new login (#14673)
							
							
							
							
							
							
							
							* wip
* Update CHANGELOG.md
* wip
* fix
* Update index.d.ts
* Update SigninService.ts
* Update MkNotification.vue 
							
						 | 
						
							2024-10-03 15:06:04 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									かっこかり
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d8a2eeb7ed
								
							
						 | 
						
							
							
								
								feat: エクスポート完了時に通知を発行するように (#14484)
							
							
							
							
							
							
							
							* feat: エクスポート完了時に通知を発行するように
* Update Changelog
* entitity -> entity
* fix: ペイロードを含むように
* fix icon
* exportableEntities -> userExportableEntities 
							
						 | 
						
							2024-09-26 14:15:03 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									かっこかり
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f0834ca14c
								
							
						 | 
						
							
							
								
								enhance: ユーザーコンテンツのインポート操作の実行可否をロールで制御できるように (#14583)
							
							
							
							
							
							
							
							* enhance: インポート操作の実行可否をロールで制御できるように
* Update Changelog 
							
						 | 
						
							2024-09-20 21:04:58 +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 | 
						
						
							
							
							
								
							
							
						 |