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
..
views	Merge branch 'develop' into merge/2025-03-24	2025-04-24 13:07:41 -04:00
bios.css	(re) update SPDX-FileCopyrightText	2024-02-13 15:59:27 +00:00
bios.js	fix locales versioning in backend client	2024-10-15 21:40:20 -04:00
boot.embed.js	fix software name in boot.embed.js, boot.js, and error.js	2025-04-01 12:30:35 -04:00
boot.js	fix software name in boot.embed.js, boot.js, and error.js	2025-04-01 12:30:35 -04:00
cli.css	(re) update SPDX-FileCopyrightText	2024-02-13 15:59:27 +00:00
cli.js	(re) update SPDX-FileCopyrightText	2024-02-13 15:59:27 +00:00
ClientLoggerService.ts	(re) update SPDX-FileCopyrightText	2024-02-13 15:59:27 +00:00
ClientServerService.ts	merge upstream again	2025-04-24 14:23:45 -04:00
error.css	merge upstream	2025-03-25 16:14:53 -04:00
error.js	fix software name in boot.embed.js, boot.js, and error.js	2025-04-01 12:30:35 -04:00
FeedService.ts	merge upstream again	2025-04-24 14:23:45 -04:00
manifest.json	chore: change manifest misskey to sharkey	2023-09-25 12:17:11 +02:00
style.css	Merge branch 'misskey-develop' into merge/2025-03-24	2025-04-29 15:54:11 -04:00
style.embed.css	feat(frontend): タイトルバーを表示できるように	2025-04-29 09:43:15 +09:00
UrlPreviewService.ts	Merge commit from fork	2025-04-29 08:15:54 +09:00