Hazelnoot
a4dd19fdd4
merge upstream again
2025-04-24 14:23:45 -04:00
饺子w (Yumechi)
7a41cfe28b
enhance(backend): DB note (userId) インデクス -> (userId, id) 複合インデクスにする ( #15879 )
...
* enhance(backend): use composite index for ordering notes by user
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
* fixup! enhance(backend): use composite index for ordering notes by user
---------
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2025-04-23 14:29:42 +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
syuilo
c500e4392a
hideNotesInSensitiveChannel -> excludeNotesInSensitiveChannel
2025-04-08 20:50:38 +09:00
Hazelnoot
3eeb53ff63
Merge branch 'misskey-develop' into merge/2025-03-24
...
# Conflicts:
# package.json
# packages/backend/src/core/AccountMoveService.ts
# packages/frontend/src/components/MkDateSeparatedList.vue
# packages/misskey-js/etc/misskey-js.api.md
# pnpm-lock.yaml
2025-04-03 22:06:37 -04:00
anatawa12
cab82452ec
Copy role on move ( #15745 )
...
* feat(backend): copyOnMoveAccount
* feat(endpoints): copyOnMoveAccount
* feat(frontend): copyOnMoveAccount
* docs(changelog): アカウントのマイグレーション時に古いアカウントからロールをコピーできるようになりました。
* fix: spdx header for migration
* Update locales/ja-JP.yml
* copyOnMoveAccount -> preserveAssignmentOnMoveAccount
* fix: check for preserveAssignmentOnMoveAccount
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-03 19:22:49 +09:00
Hazelnoot
dab9b518e4
merge from misskey-develop
2025-04-02 22:29:14 -04:00
Nanashi.
98eadd7093
feat: アンテナでセンシティブなチャンネルからのノートを除外できるように ( #15346 )
...
* feat(db): マイグレーションを追加
* feat(backend): カラムの定義を追加
* wip
* feat: フラグを設定出来るように
* feat: /notesエンドポイントを対応
* feat: websocketを対応
* test: テストを追加
* docs: CHANGELOGを更新
* docs: CHANGELOGの追加場所を修正
* chore: api.jsonを更新
* docs(CHANGELOG): General欄に移動
* docs: フォーマットを揃える
* chore: クエリを削除
* revert: 英訳を消す
* chore: note.channelを追加するところを変える
* docs: CHANGELOGを更新する
* docs(CHANGELOG): 2025.3.2に移動
* chore: changelogを下に移動
* ci: CI再実行用の空コミット
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-02 16:01:24 +09:00
Hazelnoot
949baa9b8b
Revert "feat: google analytics ( #15451 )"
...
This reverts commit 2b6638e1
2025-03-25 17:30:28 -04:00
Hazelnoot
d8908ef2d8
merge upstream
2025-03-25 16:14:53 -04: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
Hazelnoot
bb3d710927
allow unsigned fetch for all system users
2025-03-16 10:49:16 -04:00
Hazelnoot
a35c2f214b
convert Authorized Fetch to a setting and add support for hybrid mode (essential metadata only)
2025-03-16 10:07:57 -04:00
饺子w (Yumechi)
a710af54ed
fix(backend): fix ApPersonService unsound type cast ( #15629 )
...
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2025-03-09 00:11:34 +00:00
饺子w (Yumechi)
5be5c8bec4
fix(backend): fixup migration for incorrect extraction on system accounts table ( #15613 )
...
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2025-03-06 23:47:30 +00:00
Marie
40599190f7
add: libretranslate
2025-03-06 01:03:02 +01:00
かっこかり
e8a6629cb5
fix(backend): システムアカウント系のマイグレーション不足を修正 ( #15586 )
...
* fix(backend): プロキシアカウントのロールバック用マイグレーションを追加
* fix
* separate newly-added `up` command
* drop backwards-compatibility
* docs
2025-03-05 16:49:49 +09:00
syuilo
616cccf251
enhance(backend): refine system account ( #15530 )
...
* wip
* wip
* wip
* Update SystemAccountService.ts
* Update 1740121393164-system-accounts.js
* Update DeleteAccountService.ts
* wip
* wip
* wip
* wip
* Update 1740121393164-system-accounts.js
* Update RepositoryModule.ts
* wip
* wip
* wip
* Update ApRendererService.ts
* wip
* wip
* Update SystemAccountService.ts
* fix tests
* fix tests
* fix tests
* fix tests
* fix tests
* fix tests
* add print logs
* ログが長すぎて出てないかもしれない
* fix migration
* refactor
* fix fed-tests
* Update RelayService.ts
* merge
* Update user.test.ts
* chore: emit log
* fix: tweak sleep duration
* fix: exit 1
* fix: wait for misskey processes to become healthy
* fix: longer sleep for user deletion
* fix: make sleep longer again
* デッドロック解消の試み
https://github.com/misskey-dev/misskey/issues/15005
* Revert "デッドロック解消の試み"
This reverts commit 266141f66fb584371bbb56ef7eba04e14bcff94d.
* wip
* Update SystemAccountService.ts
---------
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
2025-03-02 20:06:20 +09:00
syuilo
2b6638e160
feat: google analytics ( #15451 )
...
* wip backend
* wip frontend
* build misskey-js
* implement control panel
* fix
* introduce analytics wrapper
* spdx
* Update analytics.ts
* Update common.ts
* wip
* wip
* wip
* wip
* wip
* Update CHANGELOG.md
---------
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
2025-02-25 11:51:23 +00:00
Hazelnoot
292d3b9229
add "reject quotes" toggle at user and instance level
...
+ improve, cleanup, and de-duplicate quote resolution
+ add warning message when quote cannot be loaded
+ add "process error" framework to display warnings when a note cannot be correctly loaded from another instance
2025-02-20 09:57:48 -05:00
dakkar
534c35cca2
merge: Add "force content warning" setting for user moderation ( resolves #905 ) ( !876 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/876
Closes #905
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-20 10:20:49 +00:00
Hazelnoot
81944b3bdf
implement AP fetch logs
2025-02-16 19:25:22 -05:00
Hazelnoot
cc2edae7ab
rename activity_log and activity_context to ap_inbox_log and ap_context
2025-02-16 19:25:04 -05:00
Hazelnoot
0979392925
make activity_log.duration nullable
2025-02-16 19:25:04 -05:00
Hazelnoot
e35e92beb9
log inbound activity duration
2025-02-16 19:25:04 -05:00
Hazelnoot
07cd01ec34
add missing constraint names to SkActivityLog and SkActivityContext
2025-02-16 19:25:04 -05:00
Hazelnoot
b65b4ecadc
add inbound activity logger for debugging
2025-02-16 19:25:02 -05:00
Hazelnoot
ea89348b62
add user-level "force content warning" moderation feature
2025-02-16 19:20:37 -05:00
Hazelnoot
667262dcfb
Merge branch 'develop' into merge/2024-02-03
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/core/SearchService.ts
# packages/frontend/src/pages/search.note.vue
# packages/misskey-js/src/autogen/types.ts
# sharkey-locales/en-US.yml
2025-02-13 17:04:50 -05:00
Hazelnoot
ed981a6970
add new note search file types (module, flash) and optimize file type query
2025-02-13 09:28:46 -05: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
c8f8a61a00
add MiUserProfile.defaultCWPriority property and API
2025-02-05 14:22:50 -05:00
Hazelnoot
74407bc8ee
add MiUserProfile.defaultCW property and API
2025-02-05 14:22:50 -05:00
Hazelnoot
a4e86758c1
merge upstream 2025-02-03
2025-02-03 14:36:09 -05:00
Kinetix
4d91baaa13
Adjust as per suggestions in !877
2025-01-31 10:22:13 -08:00
Kinetix
993532bc1f
Adding robots.txt override via admin control panel
...
This is a requested low priority feature in #418 - I created the changes
to follow similarly to how the Instance Description is handled.
2025-01-28 15:57:45 -08:00
おさむのひと
f9ad127aaf
feat: 新カスタム絵文字管理画面（β）の追加 ( #13473 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* fix
* fix
* fix
* fix size
* fix register logs
* fix img autosize
* fix row selection
* support delete
* fix border rendering
* fix display:none
* tweak comments
* support choose pc file and drive file
* support directory drag-drop
* fix
* fix comment
* support context menu on data area
* fix autogen
* wip イベント整理
* イベントの整理
* refactor grid
* fix cell re-render bugs
* fix row remove
* fix comment
* fix validation
* fix utils
* list maximum
* add mimetype check
* fix
* fix number cell focus
* fix over 100 file drop
* remove log
* fix patchData
* fix performance
* fix
* support update and delete
* support remote import
* fix layout
* heightやめる
* fix performance
* add list v2 endpoint
* support pagination
* fix api call
* fix no clickable input text
* fix limit
* fix paging
* fix
* fix
* support search
* tweak logs
* tweak cell selection
* fix range select
* block delete
* add comment
* fix
* support import log
* fix dialog
* refactor
* add confirm dialog
* fix name
* fix autogen
* wip
* support image change and highlight row
* add columns
* wip
* support sort
* add role name
* add index to emoji
* refine context menu setting
* support role select
* remove unused buttons
* fix url
* fix MkRoleSelectDialog.vue
* add route
* refine remote page
* enter key search
* fix paste bugs
* fix copy/paste
* fix keyEvent
* fix copy/paste and delete
* fix comment
* fix MkRoleSelectDialog.vue and storybook scenario
* fix MkRoleSelectDialog.vue and storybook scenario
* add MkGrid.stories.impl.ts
* fix
* [wip] add custom-emojis-manager2.stories.impl.ts
* [wip] add custom-emojis-manager2.stories.impl.ts
* wip
* 課題はまだ残っているが、ひとまず完了
* fix validation and register roles
* fix upload
* optimize import
* patch from dev
* i18n
* revert excess fixes
* separate sort order component
* add SPDX
* revert excess fixes
* fix pre test
* fix bugs
* add type column
* fix types
* fix CHANGELOG.md
* fix lit
* lint
* tweak style
* refactor
* fix ci
* autogen
* Update types.ts
* CSS Module化
* fix log
* 縦スクロールを無効化
* MkStickyContainer化
* regenerate locales index.d.ts
* fix
* fix
* テスト
* ランダム値によるUI変更の抑制
* テスト
* tableタグやめる
* fix last-child css
* fix overflow css
* fix endpoint.ts
* tweak css
* 最新への追従とレイアウト微調整
* ソートキーの指定方法を他と合わせた
* fix focus
* fix layout
* v2エンドポイントのルールに対応
* 表示条件などを微調整
* fix MkDataCell.vue
* fix error code
* fix error
* add comment to MkModal.vue
* Update index.d.ts
* fix CHANGELOG.md
* fix color theme
* fix CHANGELOG.md
* fix CHANGELOG.md
* fix center
* fix: テーブルにフォーカスがあり、通常状態であるときはキーイベントの伝搬を止める
* fix: ロール選択用のダイアログにてコンディショナルロールを×ボタンで除外できなかったのを修正
* fix remote list folder
* sticky footers
* chore: fix ci error(just single line-break diff)
* fix loading
* fix like
* comma to space
* fix ci
* fix ci
* removed align-center
---------
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
2025-01-20 11:35:37 +00:00
dakkar
b266a5f9f6
Merge branch 'develop' into feature/2024.10
2024-12-12 17:38:29 +00:00
Hazelnoot
fe37aa2ce8
Add "enable RSS" user privacy toggle
2024-12-12 08:11:55 -05:00
dakkar
943c6414d8
merge: Enable by default and federate "hide online status" ( resolves #823 ) ( !807 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/807
Closes #823
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-12-12 13:08:19 +00:00
dakkar
6d4ae93592
Merge branch 'develop' into feature/2024.10
2024-12-12 13:04:51 +00:00
Hazelnoot
b7a6ccfef9
enable hideOnlineStatus by default for new users
2024-12-09 09:29:42 -05:00
NoriDev
2528508cff
feat: 노트 게시를 예약할 수 있음 ( yojo-art/cherrypick#483 , [ Type4ny-Project/Type4ny@271c872c ]( 271c872c97))
2024-12-09 05:31:03 +01:00
dakkar
bc816cb166
Merge tag '2024.11.0' into feature/2024.10
2024-11-22 12:29:04 +00:00
dakkar
f079edaf3c
Merge tag '2024.10.1' into feature/2024.10
2024-11-08 15:52:37 +00:00
Marie
d786e96c2b
upd: add FriendlyCaptcha as a captcha solution
...
FriendlyCaptcha is a german captcha solution which is GDPR compliant and has a non-commerical free license
2024-11-02 02:20:35 +01:00
Hazel K
560ee43dcf
separate character limits for local and remote notes
2024-10-26 09:49:28 -04:00
syuilo
952fec5665
feat: 過去のノートを非公開化/フォロワーのみ表示可能にできる機能 ( #14814 )
...
* wip
* Update CHANGELOG.md
* wip
* wip
* wip
* Update privacy.vue
* wip
2024-10-22 17:08:53 +09:00
syuilo
5c79d8db20
feat: ノートの閲覧にログイン必須にする設定 ( #14799 )
...
* wip
* wip
* wip
* Update packages/frontend/src/pages/note.vue
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
* wip
* Update WebhookTestService.ts
* Update privacy.vue
* wip
* rename
* Update locales/ja-JP.yml
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
* 🎨
* wip
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
2024-10-21 12:49:29 +09:00
Marie
65ac5fef46
fix: default sensitive not letting users unmark files
2024-10-20 11:04:48 +02:00
