zima
d472c3b41e
Merge tag '2025.2.2' into update-to-2025.2.2
2025-03-27 13:30:04 -07: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
HellhoundSoftware
6478399432
Don't sneakily disable RSS behind users' backs
...
Also keeps the database shape consistent with what the ORM model says,
because upstream forgot to do that.
2025-01-13 23:34:54 -05:00
zima
239393c64f
Merge tag '2024.11.2' into Chore-Update-upstream-to-2024.11.2
2025-01-13 21:01:36 -07:00
HellhoundSoftware
a3731f3392
sort custom emoticons in picker by sortKey ( #18 )
2024-12-20 19:24:43 -05: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
HellhoundSoftware
6c92c9c3b3
migration must happen after fixorm
2024-11-10 02:55:02 -05:00
HellhoundSoftware
7e064399f8
non-fucked migration script
2024-11-10 02:32:01 -05:00
HellhoundSoftware
2716753267
she migrate on my TypeORM till i (GUNSHOTS)
2024-11-10 02:31:58 -05:00
HellhoundSoftware
b62621a44d
oops :)
2024-11-10 02:29:33 -05:00
HellhoundSoftware
ce037e0738
Fix ORM models to match intended database schema
2024-11-09 19:34:25 -05: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
Hazelnoot
8a34d8e9d2
Merge branch 'develop' into feature/2024.9.0
...
# Conflicts:
# locales/en-US.yml
# locales/ja-JP.yml
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/NoteDeleteService.ts
# packages/backend/src/core/NoteEditService.ts
# packages/frontend-shared/js/config.ts
# packages/frontend/src/boot/common.ts
# packages/frontend/src/pages/following-feed.vue
# packages/misskey-js/src/autogen/endpoint.ts
2024-10-15 18:09:11 -04:00
Hazelnoot
e3c79b0c83
fix typos in track-latest-note-type migration
2024-10-15 14:16:46 -04:00
Hazel K
463b9ac59d
add filters for following feed
2024-10-15 14:16:46 -04:00
Hazel K
9d3292e6e9
add type columns to SkLatestNote
2024-10-15 14:16:46 -04:00
syuilo
ff47fef572
feat: リモートサーバーのサーバー情報を収集しないオプション ( #14634 )
...
* wip
* wip
* Update FetchInstanceMetadataService.ts
* Update FetchInstanceMetadataService.ts
* Update types.ts
2024-10-13 20:22:16 +09:00
かっこかり
45d42b8641
feat: ユーザーの名前に禁止ワードを設定できるように ( #14756 )
...
* wip
* 🎨
* Enhance: モデレーター以上は制限の影響を受けないように
* refactor
* better error handling
* fix
* Revert "better error handling"
This reverts commit 5670b29cfa18a3894d0c2abfe0e5ef862e3b9ffa.
* error handling
* エラーが出ないのを修正
* translation
* Update Changelog
* status code
* ✌️
* モデレーター以上は影響ないことを明記
* 🎨
* update changelog
* spdx
* Update update.ts
* refactor
* eliminate `screen name`
* remove untracked file
---------
Co-authored-by: KanariKanaru <93921745+kanarikanaru@users.noreply.github.com>
2024-10-13 20:21:25 +09:00
syuilo
af1cbc131f
wip ( #14745 )
2024-10-11 21:05:53 +09:00
dakkar
f00576bce6
Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
2024-10-09 15:17:22 +01:00
Hazelnoot
a90b4d487a
merge: Increase character hard limits ( resolves #686 and #696 ) ( !647 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/647
Closes #686 and #696
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-07 23:20:14 +00:00
Hazel K
0da7f9b3f6
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-07 10:45:16 -04:00
