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

654 commits

Author SHA1 Message Date
Mar0xy
6e2eabbbc9
upd: show warning in control panel if users are awaiting approval 2023-10-18 23:39:48 +02:00
Mar0xy
cf6e720139
merge: branch develop 2023-10-18 19:56:42 +02:00
Mar0xy
4b230d792c
merge: upstream changes 2023-10-18 19:48:03 +02:00
Mar0xy
5ddf7e008d
add: locales for toggles 2023-10-18 19:01:50 +02:00
Mar0xy
a4a1b8bb8b
add: isSilenced handling to user and timeline 2023-10-18 13:34:16 +02:00
Mar0xy
c21d255604
add: Bot Trending Toggle, Hide Bot in Timeline client option 2023-10-18 07:29:16 +02:00
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
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
Mar0xy
3f0cc256dc
add: locales for approval feature 2023-10-18 03:00:48 +02:00
Mar0xy
2f2d88dcfc
add: Require Approval for Signup 2023-10-18 02:41:36 +02:00
Marie
97d9510ce6
merge: "show content for all CWs" button (#83) 2023-10-17 21:34:14 +02:00
ShittyKopper
c8df61ed04 feat: "show content for all replies" button 2023-10-17 22:32:14 +03: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
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
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
まっちゃてぃー
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
3ebed5aa3e feat: local-only antenna 
Resolve #11869
 2023-10-16 15:06:00 +09:00
Mar0xy
870fbf9852
merge: transparency 
Closes transfem-org/Sharkey#65
 2023-10-15 20:07:51 +02:00
Mar0xy
18f7067103
upd: add locales for client settings 2023-10-15 19:25:21 +02:00
Mar0xy
2f1f463009
upd: client option for click to open posts 2023-10-15 19:16:14 +02:00
Mar0xy
005d7b6da5
upd: uncomment activitypub section 2023-10-15 18:35:55 +02:00
Mar0xy
704b93f7d6
upd: move some strings into i18n 2023-10-15 17:47:16 +02:00
Mar0xy
c904fa6b59
upd: add listenbrainz to mobile view 2023-10-15 17:18:09 +02:00
Marie
cb1585532f
upd: move icon on about sharkey page to the left slightly 2023-10-15 13:32:42 +02:00
Marie
46f1882123
fix: crop icon not being phosphor on drive/file 2023-10-14 14:59:32 +02:00
Mar0xy
080450c10b
upd: rename renote to boost 2023-10-14 02:46:36 +02:00
Mar0xy
2d31c189d8
add: sponsors 2023-10-14 01:59:09 +02:00
Mar0xy
67f5caa61a
fix: icons 2023-10-13 19:09:15 +02:00
Mar0xy
78b016e35c
upd: icons 2023-10-13 19:07:41 +02:00
Mar0xy
f8f128b347
merge: all upstream changes 2023-10-13 19:01:17 +02:00
syuilo
f6ba5cfaf4
merge: timeline 1 2023-10-13 17:58:11 +02:00
syuilo
096fa16c4c enhance(frontend): TLの返信表示オプションを記憶するように 
Resolve #12016
 2023-10-13 16:49:56 +09:00
syuilo
04908bc90c .js 2023-10-13 16:42:57 +09:00
syuilo
7a8d5e5840 enhance: ローカルタイムライン、ソーシャルタイムラインで返信を含むかどうか設定可能に 
Resolve #12001
 2023-10-11 10:15:44 +09:00
syuilo
51b6a012a5 fix(frontend): ユーザープロフィールページでセンシティブなメディアが隠されない問題を修正 2023-10-10 19:49:25 +09:00
syuilo
9dd0f8c39b clean up 2023-10-10 16:25:06 +09:00
かっこかり
af1087aed4
Feat:「ファイルの詳細」ページを追加 (#11995) 
* (add) ファイルビューア

* Update Changelog

* 既存のAPIを利用

* run api extratctor

* Change i18n

* (add) ページに関する説明を追加

* Update CHANGELOG

* (fix) design, classes
 2023-10-10 10:43:43 +09:00
syuilo
19a507633e lint fixes 2023-10-09 15:37:58 +09:00
Insert5StarName
bdc9619f2d test transparency on user profiles 2023-10-09 04:38:31 +02:00
syuilo
ca022cbbdf Update about-misskey.vue 2023-10-08 18:04:56 +09:00
syuilo
274c21e2cc chore(backend): tweak MkInput 2023-10-08 17:57:48 +09:00
かっこかり
4bbfc98883
Feat: タイムライン更新中に広告を挿入 (#11989) 
* Feat: タイムライン更新中に広告を挿入

* 翻訳を変更

* Run api extractor

* fix api extractor

* Update locales/ja-JP.yml

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* confirm -> mkinfo

* MkInputにmin, maxを指定できるように

* 負の値が指定されたら何もしない

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-08 17:56:44 +09:00
かっこかり
5e8c0deab3
プライバシーポリシー・運営者情報のリンクを追加 (#11925) 
* 運営者情報・プライバシーポリシーリンクを追加

* Update Changelog

* Run api extractor

* プライバシーポリシー・利用規約の同意をまとめる

* Update Changelog

* fix lint

* fix

* api extractor

* improve design

* nodeinfoにプライバシーポリシー・運営者情報を追加
 2023-10-07 13:13:13 +09:00
Mar0xy
a60ec12b4e
revert: recent change 2023-10-07 01:09:28 +02:00
Mar0xy
44cd9c0dab
upd: use calc on top, left, right for background 2023-10-07 00:57:21 +02:00