Commit graph

81 commits

Author SHA1 Message Date
Marie
f7e9ffb99a merge: Display instance follow/following relationships in instance view (partial implementation of 648) (!665)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/665

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-07 19:30:48 +00:00
PrivateGER
1c3495ef59
Make including followers in response a parameter 2024-10-07 16:23:24 +02:00
PrivateGER
bfd812720e Move styling to MkA elements 2024-10-07 12:46:28 +02:00
PrivateGER
80cbf00eac Add following and follower relationship view 2024-10-07 12:30:49 +02:00
PrivateGER
fadae347ff Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui 2024-10-06 23:13:10 +02:00
PrivateGER
f028795483 Move text into translation files 2024-10-06 20:31:41 +02:00
PrivateGER
941a200f35 Move button into button group 2024-10-06 19:53:10 +02:00
Hazel K
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
Hazel K
eec4a5082d fix OpenAPI definition for admin/meta.silencedHosts 2024-10-06 11:03:28 -04:00
Hazel K
605c22b55e add lockout for isMediaSilenced 2024-10-06 10:58:27 -04:00
Hazel K
008ac89672 fix translation string 2024-10-06 10:58:06 -04:00
Hazel K
2bc9ce93b8 add missing import 2024-10-06 10:47:55 -04:00
Hazel K
7dd296017b fix modlog and translations for "Mark as NSFW" 2024-10-05 22:43:34 -04:00
Hazel K
4da0d4be71 add option to reject reports from an instance 2024-10-05 22:01:55 -04:00
Hazel K
b23d650a15 warn when a domain is hard-blocked by a base domain 2024-10-05 20:42:31 -04:00
PrivateGER
b3f925c426 Fix breaking follow relationships + add warning counts to dialogue 2024-10-05 19:06:05 +02:00
PrivateGER
99a0f756ff Expose instance-moderation endpoints in UI 2024-10-05 19:06:05 +02:00
dakkar
cfa9b852df Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07 2024-08-02 12:25:58 +01:00
anatawa12
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
dakkar
f2c56f395e replaced more ti-* 2024-06-22 15:53:36 +01:00
dakkar
138127a5b6 replaced ti-apps and a few more 2024-06-22 15:53:36 +01:00
dakkar
9f8873574c replaced tool pencil bell refresh 2024-06-22 15:53:36 +01:00
dakkar
0b72513ce5 replaced ti-external-link 2024-06-22 15:53:13 +01:00
dakkar
d2b4b2fb94 replaced ti-info-circle 2024-06-22 15:53:13 +01:00
dakkar
527bbd036c replaced ti-users 2024-06-22 15:53:13 +01:00
dakkar
7eed0aec69 replaced ti-code 2024-06-22 15:53:12 +01:00
dakkar
3372e0ffe1 Merge remote-tracking branch 'misskey/release/2024.5.0' into future 2024-05-31 12:26:07 +01:00
anatawa12
83a9aa4533
feat: suspend instance improvements (#13861)
* feat(backend): dead instance detection

* feat(backend): suspend type detection

* feat(frontend): show suspend reason on frontend

* feat(backend): resume federation automatically if the server is automatically suspended

* docs(changelog): 配信停止まわりの改善

* lint: fix lint errors

* Update packages/frontend/src/pages/instance-info.vue

* lint: fix lint error

* chore: suspendedState => suspensionState

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-05-23 15:55:47 +09:00
Marie
15d2319011
merge: upstream 2024-02-23 13:42:52 +01:00
syuilo
26c8b53f70 enhance: サーバーごとにモデレーションノートを残せるように 2024-02-22 20:59:52 +09:00
Marie
10bfc61670
merge: upstream 2024-02-19 10:47:42 +01:00
taiy
860e8bb5d8
fix(frontend/pageMetadata): ページタイトルが更新されない問題 (#13289)
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-16 16:17:09 +09:00
tamaina
c1514ce91d (re) update SPDX-FileCopyrightText
Fix  #13290
2024-02-13 15:59:27 +00:00
tamaina
311c2172d7 Revert "update SPDX-FileCopyrightText"
This reverts commit 9b5aeb76d8.
2024-02-13 15:50:11 +00:00
syuilo
9b5aeb76d8 update SPDX-FileCopyrightText 2024-02-12 11:37:45 +09:00
Marie
6a94a52131
merge: upstream 2024-02-06 21:23:37 +01:00
Marie
db012fc8c3
merge: upstream (1) 2024-01-21 13:11:23 +01:00
Acid Chicken (硫酸鶏)
7881f06be0
refactor: deprecate i18n.t (#13039)
* refactor: deprecate i18n.t

* revert: deprecate i18n.t

This reverts commit 7dbf873a2f745040ee723df5db659acacff84e12.

* chore: reimpl
2024-01-20 08:11:59 +09:00
かっこかり
c1019a006b
feat(frontend): 横スワイプでタブを切り替える機能 (#13011)
* (add) 横スワイプでタブを切り替える機能

* Change Changelog

* y方向の移動が一定量を超えたらスワイプを中断するように

* Update swipe distance thresholds

* Remove console.log

* adjust threshold

* rename, use v-model

* fix

* Update MkHorizontalSwipe.vue

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

* use css module

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-01-18 18:21:33 +09:00
Marie
7552cea69a
merge: upstream 2024-01-09 02:57:57 +01:00
おさむのひと
fa9c4a19b9
refactor(frontend): os.tsに引き込んだscripts/api.tsの再exportをやめる (#12694)
* refactor(frontend): os.tsに引き込んだscripts/api.tsの再exportをやめる

* fix

* fix

* renate to "misskeyApi"

* rename file
2024-01-04 18:32:46 +09:00
GrapeApple0
5e0eb76d3b
Revert "refactor: paginationの型を明示する (#12809)" (#12810)
This reverts commit 6855079811.
2023-12-28 09:46:20 +01:00
GrapeApple0
6415a789ae
refactor: paginationの型を明示する (#12809)
* refactor: paginationの型を明示する

* asではなくsatisfiesを使うように
2023-12-28 09:45:16 +01:00
GrapeApple0
6439c7b64b
Revert "refactor: paginationの型を明示する (#12809)" (#12810)
This reverts commit 6855079811.
2023-12-27 15:55:09 +09:00
GrapeApple0
6855079811
refactor: paginationの型を明示する (#12809)
* refactor: paginationの型を明示する

* asではなくsatisfiesを使うように
2023-12-26 21:40:27 +09:00
Marie
166a940f02 chore: lint 2023-12-23 04:26:23 +01:00
Marie
5db583a3eb merge: upstream 2023-12-23 02:09:23 +01:00
まっちゃとーにゅ
ab5d2eca1f enhance(frontend): window.openやaタグにnoopenerオプションをつける (MisskeyIO#283) 2023-12-08 19:46:25 +09:00
zyoshoka
406b4bdbe7
refactor(frontend): 非推奨となったReactivity Transformを使わないように (#12539)
* refactor(frontend): 非推奨となったReactivity Transformを使わないように

* refactor: 不要な括弧を除去

* fix: 不要なアノテーションを除去

* fix: Refの配列をrefしている部分の対応

* refactor: 不要な括弧を除去

* fix: lint

* refactor: Ref、ShallowRef、ComputedRefの変数の宣言をletからconstに置換

* fix: type error

* chore: drop reactivity transform from eslint configuration

* refactor: remove unnecessary import

* fix: 対応漏れ
2023-12-07 14:42:09 +09:00
Mar0xy
93869a5f34
add: mark instance as NSFW
Closes transfem-org/Sharkey#197
2023-12-05 22:20:52 +01:00