monkee.ch/monkeeShark
1
0
Fork 0
Code Pull requests Activity
25926 commits 29 branches 918 tags 156 MiB
Commit graph

25926 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marie
182bf7e7d6
Merge branch 'develop' into feature/approval 2023-10-18 05:40:32 +02:00
Mar0xy
cb9bd6a004
add: mark all media from user as NSFW 
Closes transfem-org/Sharkey#69
 2023-10-18 05:32:47 +02:00
syuilo
3c5bcdd7b3 Update CHANGELOG.md 2023-10-18 12:27:15 +09:00
syuilo
6cc02fee99 enhance(backend): improve fanout tl 
Resolve #11958
Resolve #12061
 2023-10-18 12:26:16 +09:00
syuilo
2a88d8ee2d refactor(backend): rename service 2023-10-18 12:07:18 +09:00
Mar0xy
288fa1143d
upd: display correct approval_required value on masto instance endpoint 2023-10-18 04:32:40 +02:00
Mar0xy
cab0ec5de1
upd: add Not Approved state sorter to Users tab 2023-10-18 03:40:51 +02:00
Mar0xy
32fc540df4
upd: handle email signups properly with approval enabled 2023-10-18 03:21:06 +02:00
syuilo
52a82ac193 Update about-misskey.vue 2023-10-18 10:07:21 +09:00
nryeouo
d82b3a08e2
Update ja-JP.yml (#12053) 
ポスト
 2023-10-18 10:01:50 +09:00
Mar0xy
3f0cc256dc
add: locales for approval feature 2023-10-18 03:00:48 +02:00
taichan
f6e1ee1d40
users/notesでDBから参照した際にチャンネル投稿のみ取得される問題を修正 (#12056) 
* fix(backend): ユーザーのノート取得でDBにfallbackした際にチャンネルノートのみになる

* Update CHANGELOG

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-18 09:55:15 +09:00
woxtu
0bddd0ceae
Remove unnecessary nullish coalescing (#12058) 2023-10-18 09:54:18 +09:00
かっこかり
53099cad5a
fix: admin/update-meta が保存できない (#12057) 
* Fix: invalid param impressumUrl

* Update CHANGELOG.md
 2023-10-18 09:48:49 +09:00
syuilo
145c5c8b2b update deps 2023-10-18 09:43:59 +09:00
Mar0xy
2f2d88dcfc
add: Require Approval for Signup 2023-10-18 02:41:36 +02:00
Mar0xy
5c7f517895
chore: change some misskey references to sharkey 2023-10-17 23:55:53 +02:00
Marie
715dea9414
upd: remove cutting off the description on relays 2023-10-17 22:51:05 +02:00
Amelia Yukii
22fb72fcfb
Update Dockerfile 2023-10-17 21:40:21 +02:00
Marie
97d9510ce6
merge: "show content for all CWs" button (#83) 2023-10-17 21:34:14 +02:00
ShittyKopper
1a9e94a554 upd: ja-JP translation for expand/collapseAllCws. machine translated 2023-10-17 22:32:27 +03:00
ShittyKopper
c8df61ed04 feat: "show content for all replies" button 2023-10-17 22:32:14 +03:00
Mar0xy
6cac291d3d
fix: relays not getting accepted 2023-10-17 21:08:15 +02:00
Marie
f73e56ca2c
fix: invalid param impressumUrl 2023-10-17 19:39:48 +02:00
Amelia Yukii
284beac14a
Update SECURITY.md 2023-10-17 16:07:09 +02:00
anatawa12
5a3c6575dd
新規にフォローした人のwithRepliesをtrueにする機能を追加 (#12048) 
* feat: add defaultWithReplies to MiUser

* feat: use defaultWithReplies when creating MiFollowing

* feat: update defaultWithReplies from API

* feat: return defaultWithReplies as a part of $i

* feat(frontend): configure defaultWithReplies

* docs(changelog): 新規にフォローした人のをデフォルトでTL二追加できるように

* fix: typo

* style: fix lint failure

* chore: improve UI text

* chore: make optional params of  UserFollowingService.follow() object

* chore: UserFollowingService.follow() accept withReplies

* chore: add withReplies to MiFollowRequest

* chore: process withReplies for follow request

* feat: accept withReplies on 'following/create' endpoint

* feat: store defaultWithReplies in client store

* Revert "feat: return defaultWithReplies as a part of $i"

This reverts commit f2cc4fe6

* Revert "feat: update defaultWithReplies from API"

This reverts commit 95e3cee6

* Revert "feat: add defaultWithReplies to MiUser"

This reverts commit 9f5ab14d7063532de2b049bc2ed40a15658168f5.

* feat: configuring withReplies in import-following

* feat(frontend): configure withReplies

* fix(frontend): incorrectly showRepliesToOthersInTimeline can be shown

* fix(backend): withReplies of following/create not working

* fix(frontend): importFollowing error

* fix: withReplies is not working with follow import

* fix(frontend): use v-model

* style: fix lint

---------

Co-authored-by: Sayamame-beans <61457993+sayamame-beans@users.noreply.github.com>
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
 2023-10-17 20:56:17 +09:00
Marie
f71a675a34
ci: remove updating server for stable releases 2023-10-17 09:34:58 +02:00
Insert5StarName
4d71afa884 fix: move background into seperate element to prevent it from being funny 2023-10-17 08:23:10 +02:00
Mar0xy
6f46dfa7bb
upd: change top size on background css 
Closes transfem-org/Sharkey#82
 2023-10-17 02:12:58 +02:00
syuilo
e9db0680c4 update deps 2023-10-17 09:04:17 +09:00
syuilo
5686e1d2d0 refactor 2023-10-17 09:00:42 +09:00
Mar0xy
5710735a15
upd: icons on instance-block page 2023-10-16 23:49:30 +02:00
Mar0xy
68886b9ab5
merge: upstream performance changes & instance silencing 2023-10-16 23:38:21 +02:00
Mar0xy
9e74455320
up: dev version 2023-10-16 23:12:53 +02:00
syuilo
9338ab461e update deps 2023-10-16 20:13:05 +09:00
syuilo
7e4562d50a Update CHANGELOG.md 2023-10-16 20:12:06 +09:00
まっちゃてぃー
5efd01ba70
feat: サーバーサイレンス機能を追加 (#12031) 
* feat : サーバーサイレンスを追加

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update locale

* Update instance-info.vue

* update misskey-js.api.md

* lint fix

* migration fix

* 既存のものを使うように

* fix

* 色々直した

* Update packages/frontend/src/pages/admin/instance-block.vue

* Update packages/frontend/src/pages/admin/instance-block.vue

* Update packages/frontend/src/components/MkInstanceCardMini.vue

* Update packages/backend/src/core/entities/InstanceEntityService.ts

* Update packages/backend/src/core/entities/InstanceEntityService.ts

* Update packages/backend/src/core/entities/InstanceEntityService.ts

* Update packages/backend/src/core/UserFollowingService.ts

* Update packages/backend/src/core/UserFollowingService.ts

* fix: サイレンスされてるサーバーからの投稿は全部ホームにする

* fix: undefinedでfalseを返すようにした

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-16 20:11:27 +09:00
syuilo
1966876320 fix test 2023-10-16 17:42:33 +09:00
syuilo
3ebed5aa3e feat: local-only antenna 
Resolve #11869
 2023-10-16 15:06:00 +09:00
syuilo
6a321ba340 fix test 2023-10-16 14:35:44 +09:00
syuilo
34d1b463a4 fix tests 2023-10-16 12:58:17 +09:00
syuilo
24437a04d4 fix of 1fa1d31696 2023-10-16 12:00:56 +09:00
syuilo
1fa1d31696 perf(backend): createdAtをidから取得するように & 無駄なDateインスタンスの生成を避けるように 2023-10-16 10:45:22 +09:00
Marie
55c5412aa0
chore: set version 2023-10-16 02:13:49 +02:00
Mar0xy
b7fd84c643
upd: remove show more button effects 2023-10-16 02:05:34 +02:00
Mar0xy
6779272c81
upd: change how show more gets shown 2023-10-16 01:39:02 +02:00
Mar0xy
1eb536f086
upd: remove buggy backdrop-filter 2023-10-16 00:52:03 +02:00
Mar0xy
67c95ea646
fix: type error 2023-10-15 23:42:47 +02:00
Mar0xy
ca428977a5
merge: upstream 2023-10-15 23:36:38 +02:00
Mar0xy
cec0207b60
Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop 2023-10-15 23:19:50 +02:00