Commit graph

30932 commits

Author SHA1 Message Date
Hazelnoot
4ae96e48db remove unnecessary comment 2025-04-13 18:51:00 -04:00
Hazelnoot
a28b80a0dd Merge remote-tracking branch 'origin/merge/2025-03-24-dakkar' into merge/2025-03-24 2025-04-13 13:08:00 -04:00
Hazelnoot
91fb75dece Merge branch 'develop' into merge/2025-03-24 2025-04-13 13:07:24 -04: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
おさむのひと
0d4feed6d3
enhance(backend): フォローしているユーザーならフォロワー限定投稿のノートでもアンテナで検知できるように (#15264)
* フォローしているユーザーなら鍵ノートでもアンテナにひっかかるように

Co-authored-by: kozakura913 <98575220+kozakura913@users.noreply.github.com>
Co-authored-by: mai <74494945+chan-mai@users.noreply.github.com>

* Eliminate build errors by resolving conflicts

* 低コストな判定文を前にもってきて重い判定文に入る可能性を少しでも下げる

* fix CHANGELOG.md

* fix CHANGELOG.md

* fix diff

* removed comment

* fix CHANGELOG.md

---------

Co-authored-by: kozakura913 <98575220+kozakura913@users.noreply.github.com>
Co-authored-by: mai <74494945+chan-mai@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-13 20:48:18 +09:00
おさむのひと
1f0621b085
レプリケーション設定時におけるinsertOne()の挙動を調整 (#15109)
* returningを含むクエリをmasterで動かす

* wip

* wip

* fix CHANGELOG.md

* 調整

* fix

* fix import
2025-04-13 20:44:44 +09:00
anatawa12
4c473eb76d
fix: resolve with non-lowercased acct is broken (#15813)
* fix: resolve with non-lowercased acct is broken

* docs(changelog): Fix: 大文字を含むユーザの URL で紹介された場合に 404 エラーを返す問題
2025-04-13 18:34:33 +09:00
かっこかり
f7195d54d0
fix(frontend): 自動バックアップが設定されていない環境では設定が消滅する旨の警告を出すように (#15802)
* fix(frontend): 自動バックアップが設定されていない環境ではローカルの設定を削除しないように

* Update Changelog

* fix lint

* fix: 警告を出すだけのみにする

* fix

* apply suggestion
2025-04-13 16:59:01 +09:00
かっこかり
8edf1bc208
fix(backend): サーバー名の変更をシステムアカウントの名前に反映するように (#15806)
* fix(backend): サーバー名の変更をシステムアカウントの名前に反映するように

* Update Changelog
2025-04-13 16:21:18 +09:00
かっこかり
dd5dd6184a
fix(frontend): keyval-storeの値が削除できずに処理が止まる問題を修正 (#15803)
* fix(frontend): keyval-storeの値が削除できずに処理が止まる問題を修正

* Update Changelog

* implement abortcontroller

* fix lint
2025-04-13 15:48:43 +09:00
dakkar
ebc1001e3f put clickToOpen and collapseFiles back 2025-04-12 13:47:39 +01:00
dakkar
f9c61b452e fix where of our settings, should fix migrations 2025-04-12 13:47:24 +01:00
dakkar
be76469d4f put autoloadConversation back
it got lost in the merge
2025-04-12 13:29:24 +01:00
dakkar
dbb04c6c0a fix type in MkEmojiPicker 2025-04-12 11:54:56 +01:00
dakkar
3ff3484dba update SkOldNoteWindow
* fix nyaize
* make MkPoll and plugins the same as `[MS]kNote`
2025-04-12 11:54:14 +01:00
dakkar
c4d886933e fix the models of some of our prefs 2025-04-12 11:23:03 +01:00
dakkar
e1745ea23c sort our store/prefs, migrate all of them
also fix `cornerRadius`
2025-04-12 11:21:11 +01:00
dakkar
e33d8deeee mark Sharkey's old prefs 2025-04-12 10:52:22 +01:00
renovate[bot]
81bf139e3e
fix(deps): update dependency @nestjs/common to v11.0.16 [security] (#15800)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-04-12 16:04:20 +09:00
Marie
7faef0d11e merge: feat: Allow injection of raw HTML strings inside <head> (!959)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/959

Closes #1029

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-04-12 00:11:55 +00:00
Zlendy
cf260762f4
docs: Add usage example of "customHtml.head" to ".config/example.yml" 2025-04-11 22:56:33 +02:00
Zlendy
ce26d8d3cb
feat: Allow injection of raw HTML strings inside <head> 2025-04-11 22:56:26 +02:00
Marie
965ba1ef76 merge: Fix SPDX-Header in two files (!958)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/958

Closes #1027

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2025-04-11 10:45:42 +00:00
Marie
e2507b9e0a Update 2 files
- /packages/frontend/src/scripts/chiptune2.ts
- /packages/frontend/src/components/SkModPlayer.vue
2025-04-11 08:17:49 +00:00
renovate[bot]
a0e9895764
fix(deps): update [backend] update dependencies (#15690)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-04-10 19:50:25 +09:00
かっこかり
413324a278
refactor(frontend): frontendの検索インデックス作成のスタンドアロンコマンド実装を完全に削除 (#15790)
This reverts commit e594fb0037.
2025-04-10 18:48:40 +09:00
renovate[bot]
e2b68aabae
fix(deps): update [frontend] update dependencies (#15736)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-04-10 18:26:01 +09:00
github-actions[bot]
0aaeb6d136 [skip ci] Update CHANGELOG.md (prepend template) 2025-04-09 02:17:33 +00:00
github-actions[bot]
fb277501a0 Release: 2025.4.0 2025-04-09 02:17:29 +00:00
syuilo
718138509f Update CHANGELOG.md 2025-04-09 10:56:57 +09:00
github-actions[bot]
a1ef38a606 Bump version to 2025.4.0-rc.5 2025-04-08 23:21:42 +00:00
zyoshoka
4a8b7ef23e
fix(ci): correct condition for skipping Chromatic build (#15783) 2025-04-09 08:10:17 +09:00
anatawa12
1f17161dfb
feat: show file name for warning / errors of [create-search-index] (#15785) 2025-04-09 08:10:04 +09:00
syuilo
2488708934
New Crowdin updates (#15781)
* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Korean)
2025-04-09 08:09:43 +09:00
anatawa12
628a0c71a9
fix: direct does not work in nested route (#15784) 2025-04-09 08:09:08 +09:00
syuilo
b40f5b9021 fix typo 2025-04-09 08:08:28 +09:00
syuilo
0f79db6a4d refactor 2025-04-09 08:05:27 +09:00
syuilo
910e097480 add missing SearchMarker 2025-04-09 08:04:00 +09:00
syuilo
a8acbd6e68 refactor 2025-04-09 08:01:10 +09:00
syuilo
c19f51a2ab resolve promise
https://github.com/misskey-dev/misskey/pull/15735#discussion_r2033387035
2025-04-09 07:56:20 +09:00
syuilo
1cf370882e add missing SearchMarker 2025-04-09 07:51:24 +09:00
syuilo
58cb7cf179 update i18n 2025-04-08 20:58:56 +09:00
syuilo
a51192bac5 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2025-04-08 20:50:41 +09:00
syuilo
c500e4392a hideNotesInSensitiveChannel -> excludeNotesInSensitiveChannel 2025-04-08 20:50:38 +09:00
syuilo
799226412f
Update CHANGELOG.md
Co-authored-by: anatawa12 <anatawa12@icloud.com>
2025-04-08 20:44:15 +09:00
syuilo
0d18c0169f
New Crowdin updates (#15776)
* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Korean)
2025-04-08 18:18:02 +09:00
syuilo
863fb5dd7f Update CHANGELOG.md 2025-04-08 15:20:36 +09:00
syuilo
177943b06a Update CHANGELOG.md 2025-04-08 15:19:33 +09:00
syuilo
2aa7630466 🎨 2025-04-08 15:10:51 +09:00
syuilo
c96f345f01 fix(frontend): fix control panel style 2025-04-08 10:56:52 +09:00