0da7f9b3f6
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-07 10:45:16 -04:00
fadae347ff
Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui
2024-10-06 23:13:10 +02:00
28bfd87537
merge: Add option to reject reports from an instance ( Resolves #579 , #715 , #716 ) ( !662 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/662
Closes #579 , #715 , and #716
Approved-by: dakkar <dakkar@thenautilus.net >
Approved-by: Marie <github@yuugi.dev >
2024-10-06 19:39:38 +00:00
42dbe999e1
merge: Change the recent external url warning popup to the one from Cherrypick/MisskeyIO ( !648 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/648
Approved-by: dakkar <dakkar@thenautilus.net >
Approved-by: Hazelnoot <acomputerdog@gmail.com >
2024-10-06 17:56:36 +00:00
047563bdde
Merge branch 'develop' into hazelnoot/579-reject-reports
...
# Conflicts:
# packages/frontend/src/pages/instance-info.vue
2024-10-06 12:26:25 -04:00
4ca27692ac
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-06 11:16:43 -04:00
eec4a5082d
fix OpenAPI definition for admin/meta.silencedHosts
2024-10-06 11:03:28 -04:00
7dd296017b
fix modlog and translations for "Mark as NSFW"
2024-10-05 22:43:34 -04:00
4da0d4be71
add option to reject reports from an instance
2024-10-05 22:01:55 -04:00
996d079476
Make remove-all-following remove follows in both directions
2024-10-05 19:59:50 +02:00
b3f925c426
Fix breaking follow relationships + add warning counts to dialogue
2024-10-05 19:06:05 +02:00
d5b372f7a9
upd&merge: Merge Cherrypick/MisskeyIO's external url popup, delete old popup warning and modify script to handle undefined domains
2024-10-04 02:31:22 +02:00
ac1e5a0fb5
merge: Feat: Implement "Show Below Avatar" for Avatar Decorations ( !645 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/645
Approved-by: dakkar <dakkar@thenautilus.net >
Approved-by: Marie <github@yuugi.dev >
2024-10-03 20:40:34 +00:00
40179a5591
lint fixes
2024-10-02 22:00:32 -04:00
28aa99b273
Implement "Show Below Avatar" for Avatar Decorations
2024-10-02 23:49:30 +02:00
19d7d44d0e
use QueryService for blocks and mutes
2024-10-02 15:02:22 -04:00
d7f1e3f823
respect blocks and mutes for replies and renotes
2024-10-02 13:23:01 -04:00
7603ecddac
respect domain mutes
2024-10-02 12:28:41 -04:00
705ae79eb1
Merge branch 'develop' into hazelnoot/following-timeline
2024-10-02 11:45:09 -04:00
0bd6d48c7e
merge: Customize Sidebar/Visitor/About separately from app icon. ( !632 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/632
Approved-by: dakkar <dakkar@thenautilus.net >
Approved-by: Marie <github@yuugi.dev >
2024-10-02 14:55:20 +00:00
168ff64b03
fix copyright header
2024-09-30 12:06:44 -04:00
3479c2c13a
add mutuals-only option
2024-09-30 01:12:29 -04:00
072f4b4608
add /notes/following endpoint
2024-09-30 00:49:45 -04:00
41edc4cfbd
Update 4 files
...
- /packages/frontend/src/pages/admin/branding.vue
- /packages/backend/src/models/Meta.ts
- /packages/backend/src/server/api/endpoints/admin/meta.ts
- /packages/backend/src/server/api/endpoints/admin/update-meta.ts
2024-09-23 16:34:29 +00:00
1af6f8c5da
backend configuring
2024-09-22 14:47:04 -03:00
62a81bed9b
upd: change sorting of supporters
2024-09-16 19:02:06 +02:00
2e18359dad
chore: lint
2024-09-15 18:17:35 +00:00
b7815df134
upd: fetch sponsors from OC
2024-09-15 20:04:29 +02:00
6151099f5b
Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.8
2024-08-30 12:08:31 +01:00
06da059dbf
log deletion of user files from admin -- fixes #631
2024-08-24 20:53:58 +01:00
fd744f44c1
enhance(backend): ページ、ギャラリー、Playのモデレーション強化 ( #13523 )
...
* enhance(backend): Page、ギャラリー、Playのモデレーション強化
* Update CHANGELOG.md
* fix: update misskey-js
* refactor(frontend): use `MkA`
* Update CHANGELOG.md
* fix(i18n): Page -> ページ
2024-08-17 15:01:08 +09:00
06684fe49b
fix(backend): ベースロールのポリシー変更時モデレーションログが残るように ( #14418 )
...
* fix(policies): ベースロールのポリシー変更時モデレーションログが残るように (MisskeyIO#700)
(cherry picked from commit 80389a914049f6f26237fde8da7d4e1bd41452fc)
* Update Changelog
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com >
2024-08-17 12:07:00 +09:00
ef950a345b
suspend周りの改修 ( #14409 )
...
* enhance(backend): 凍結されたアカウントのフォローリクエストを表示しないように
* Update CHANGELOG.md
* wip
* Update gen-spec.ts
* Update packages/backend/src/server/api/endpoints/admin/suspend-user.ts
Co-authored-by: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com >
* owa-
* revert misskey-js related changes (#14414 )
---------
Co-authored-by: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com >
Co-authored-by: anatawa12 <anatawa12@icloud.com >
2024-08-17 09:57:28 +09:00
86dd4abadc
Revert "enhance(backend): 凍結されたアカウントのフォローリクエストを表示しないように"
...
This reverts commit cd210001e6
2024-08-14 20:29:06 +09:00
cd210001e6
enhance(backend): 凍結されたアカウントのフォローリクエストを表示しないように
2024-08-14 18:08:51 +09:00
0aaf74ee22
fix(backend): InstanceEntityService.packMany に me が渡っていないのを修正 ( #14360 )
...
* fix: pass current user into `InstanceEntityService.packMany`
(cherry picked from commit 858ba18876acomputerdog@gmail.com >
2024-08-11 11:28:07 +09:00
0d508db8a7
fix(backend): check visibility of following/followers of remote users / feat: moderators can see following/followers of all users ( #14375 )
...
* fix(backend): check visibility of following/followers of remote users
Resolves https://github.com/misskey-dev/misskey/issues/13362 .
* test(backend): add tests for visibility of following/followers of remote users
* docs(changelog): update CHANGELOG.md
* feat: moderators can see following/followers of all users
* docs(changelog): update CHANGELOG.md
* refactor(backend): minor refactoring
`createPerson`と`if`の条件を統一するとともに、異常系の
処理をearly returnに追い出すための変更。
* feat(backend): moderators can see following/followers count of all users
As per https://github.com/misskey-dev/misskey/pull/14375#issuecomment-2275044908 .
2024-08-09 12:10:51 +09:00
34c1e9ea2b
Merge branch 'develop' into feature/misskey-2024.07
...
fixing conflicts in `package.json`
2024-08-06 10:35:14 +01:00
d9c23e92fd
merge: fix: pass current user into InstanceEntityService.packMany ( !582 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/582
Approved-by: dakkar <dakkar@thenautilus.net >
Approved-by: Marie <marie@kaifa.ch >
2024-08-02 18:40:53 +00:00
cfa9b852df
Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07
2024-08-02 12:25:58 +01:00
858ba18876
fix: pass current user into InstanceEntityService.packMany
2024-08-01 08:24:50 -04:00
5c42a0e439
feat: media silence ( #13842 )
...
* feat: media silence
* fix: lint
* feat: deny creating custom emoji reaction and using custom emoji from media silenced hosts
* chore: メディアサイレンスの説明にカスタム絵文字の話を追加
* Update locales/ja-JP.yml
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com >
* chore: update index.d.ts
* docs(changelog): update changelog
---------
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com >
2024-07-30 19:47:45 +09:00
8f40f932e4
自分のフォロワー限定投稿に対するリプライがホームタイムラインで見えないことが有る問題を修正 ( #13835 )
...
* fix: reply to my follower notes are not shown on the home timeline
* fix: reply to follower note by non-following is on social timeline
* docs: changelog
* test: add endpoint test for changes
* test(e2e): 自分のfollowers投稿に対するリプライが流れる
* test(e2e/streaming): 自分のfollowers投稿に対するリプライが流れる
* test(e2e/streaming): フォローしていないユーザによるフォロワー限定投稿に対するリプライがソーシャルタイムラインで表示されることがある問題
* test(e2e/timelines): try fixing typecheck error
---------
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com >
2024-07-30 19:44:08 +09:00
d0b7c74fd1
検索からハッシュタグのページが開けるように、users/searchに@から始まる文字列が与えられた際の処理を修正 等 ( #13858 )
...
* enhance(frontend): 検索からハッシュタグのページを開けるように
* fix(frontend): 照会で入力が`#`のみの場合は`/tags/`に遷移しないように
* docs(changelog): update changelog
* enhance(frontend): ユーザー検索からもハッシュタグのページを開けるように
* docs(changelog): update changelog
* enhance(frontend): 検索範囲等が指定されている時は照会/ハッシュタグページを開かないように
* enhance(frontend): 検索内容に空白が含まれている場合は照会/ハッシュタグページを開かないように
* docs(changelog): update changelog
* Revert "enhance(frontend): 検索範囲等が指定されている時は照会/ハッシュタグページを開かないように"
This reverts commit f84eecea964b90e9b115eac19ed6f19a603a6bbc.
* enhance(frontend): 検索から照会/ハッシュタグページを開くかどうか確認するように
* docs(changelog): update changelog
* chore: fix lint
* docs(changelog): update changelog insertion position
* enhance(frontend): 検索から`@user@host`の形式で照会出来るように
* fix(frontend): 照会で入力が`@`のみの場合に`/@`に遷移しないように
* fix(backend): `users/search`において`@`から始まるqueryに対する処理が正しくなかった問題を修正
* docs(changelog): update changelog
* chore(backend): fix lint error
* fix(backend): more improvements for users/search when query startswith `@`
* chore: unify common conditions
* docs(changelog): refine changelog
* chore(backend): fix lint error
* MkInputをpreventに対応させ、enterの意図せぬ伝搬を防ぐ
* chore(frontend/search.user): use .prevent to prevent the propagation of enter instead of setTimeout
---------
Co-authored-by: samunohito <46447427+samunohito@users.noreply.github.com >
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com >
Co-authored-by: taichanne30 <dev@taichan.site >
2024-07-30 19:18:43 +09:00
de3ddb5b44
enhance: 管理画面でアーカイブにしたお知らせを表示・編集できるように ( #14286 )
...
* enhance: 管理画面でアーカイブにしたお知らせを表示できるように
* Update Changelog
2024-07-30 13:02:03 +09:00
ad9848acfa
merge: rate limit all password checks - fixes #540 ( !568 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/568
Closes #540
Approved-by: Marie <marie@kaifa.ch >
Approved-by: Tess K <me@thvxl.se >
2024-07-29 10:47:33 +00:00
337b42bcb1
revert 5f88d56d96
...
バグがある(かつすぐに修正できそうにない) & まだレビュー途中で意図せずマージされたため
2024-07-20 21:33:20 +09:00
01b10d0d3b
fix drive search query
...
`.andWhere` does not add parentheses, so that `or` changed the whole
meaning of the query
2024-07-19 14:32:14 +01:00
de166a8ed4
fix(backend): リノートミュートがキャッシュが切れるまで効かない問題を修正 ( #14242 )
...
* Fix: RenoteMuteがキャッシュが切れるまで効かない問題を修正
(cherry picked from commit e9601029b52e0ad43d9131b555b614e56c84ebc1)
* update changelog
* 🎨
* remove unused import
* 消したときもキャッシュを飛ばすように
* lint
---------
Co-authored-by: mattyatea <mattyacocacora0@gmail.com >
2024-07-18 08:55:36 +09:00
cfdad45092
fix: ソーシャルタイムラインにローカルタイムラインに表示される自分へのリプライが表示されない問題を修正 ( #13978 )
...
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com >
2024-07-18 02:06:31 +09:00
Hazel K