Commit graph

1338 commits

Author SHA1 Message Date
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
Marie
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
PrivateGER
f028795483 Move text into translation files 2024-10-06 20:31:41 +02:00
Hazelnoot
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
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
9b11aead5a Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked 2024-10-06 10:48:20 -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
Hazel K
e622ab7cc7 indicate if a user is blocked / muted by the current user 2024-10-05 19:13:09 -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
Marie
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
Marie
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
dakkar
fa71e54812 backup/restore disableCatSpeak 2024-10-03 16:59:08 +01:00
Leah
d55c86548d You can now disable cat speak in settings (client side) 2024-10-03 16:58:49 +01:00
fEmber
e2beec33f8 merge: Minor issue fixes on the frontend (!625)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/625

Closes #659, #656, #651, #661, #632, and #710

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-10-03 15:52:00 +00:00
CenTdemeern1
28aa99b273 Implement "Show Below Avatar" for Avatar Decorations 2024-10-02 23:49:30 +02:00
dakkar
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
piuvas
de33ade423
fix wording for the branding setting 2024-09-29 11:45:35 -03:00
丈槍由紀
025b2467b2 Add back button to the Roles page. 2024-09-27 23:00:08 -04:00
丈槍由紀
d9ba0f9f0d Add back button to antenna, list, and tag timelines. 2024-09-27 23:00:02 -04:00
dakkar
69efba9366 merge: Fetch sponsors from OC (!624)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/624

Closes #653

Approved-by: Julia <julia@insertdomain.name>
Approved-by: Tess K <me@thvxl.se>
2024-09-23 17:57:39 +00:00
piuvas silly
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
piuvas
4ee2973303
requested fixes! 2024-09-22 17:32:46 -03:00
piuvas
d839c1eee1
sidebarlogo localization 2024-09-22 15:28:10 -03:00
piuvas
ec5b3c8788
frontend changes 2024-09-22 14:47:04 -03:00
piuvas
1af6f8c5da
backend configuring 2024-09-22 14:47:04 -03:00
Esurio
7aa956aca9
fix: use i18n in settings 2024-09-22 14:47:04 -03:00
Esurio
cc51f7038e fix: use i18n in settings 2024-09-19 12:37:56 +00:00
Marie
bde6bb0bd2
upd: don't ignore new lines on file info 2024-09-16 00:15:06 +02:00
Marie
b7815df134
upd: fetch sponsors from OC 2024-09-15 20:04:29 +02:00
Julia
d4c5322f9c merge: 2024.8 (!610)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/610

Approved-by: Julia <julia@insertdomain.name>
2024-09-13 15:57:16 +00:00
dakkar
fcd63e0378 merge: chore: Update Donation button (!616)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/616

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
2024-09-08 16:33:24 +00:00
Marie
14ce6f7cbb chore: add missing person 2024-09-06 22:59:35 +00:00
Marie
ccc2cdb887 chore: update contributor section 2024-09-06 22:46:34 +00:00
Marie
19c90d8e9f chore: update Ko-Fi text to OpenCollective 2024-09-06 21:27:35 +00:00
Marie
9a7300489c chore: update donation links in backend and frontend 2024-09-06 21:25:38 +00:00
Essem
8669125f37
chore: Remove esm from about page 2024-09-04 16:06:15 -05:00
dakkar
6151099f5b Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.8 2024-08-30 12:08:31 +01:00
dakkar
d16f301d90 update testers for 2024.7
karilaa.app seems down, and I've not heard from them

plasmatrap has been running our release candidate for a few days
2024-08-22 14:07:21 +01:00
dakkar
a408d32bb7 fix button translation
that Japanese string exactly matches that i18n key
2024-08-19 20:49:47 +01:00
syuilo
427f4a2cda Update about-misskey.vue 2024-08-18 10:10:06 +09:00
かっこかり
4e0d57000c
fix(frontend): 以前のpopupの呼び出し方を修正 (#14421) 2024-08-17 18:04:52 +09:00
syuilo
c0de57c08d Update about-misskey.vue 2024-08-17 17:57:27 +09:00