Commit graph

2891 commits

Author SHA1 Message Date
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
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
4ca27692ac Merge branch 'develop' into hazelnoot/following-timeline 2024-10-06 11:16:43 -04:00
Hazel K
eec4a5082d fix OpenAPI definition for admin/meta.silencedHosts 2024-10-06 11:03:28 -04:00
Hazelnoot
ad4054f4e4 merge: Dont mark backfetched notes as silent (!655)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/655

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-06 13:56:44 +00:00
Marie
17617b6355 merge: Include Mastodon's "indexable" property on federated user profiles (resolves #713) (!660)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/660

Closes #713

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-06 10:47:14 +00:00
Hazel K
7dd296017b fix modlog and translations for "Mark as NSFW" 2024-10-05 22:43:34 -04:00
Hazel K
61124699da fix lint errors 2024-10-05 22:21:00 -04:00
Hazel K
4da0d4be71 add option to reject reports from an instance 2024-10-05 22:01:55 -04:00
Hazel K
c315f9ccf5 include Mastodon's "indexable" property on federated user profiles 2024-10-05 19:48:35 -04:00
PrivateGER
996d079476 Make remove-all-following remove follows in both directions 2024-10-05 19:59:50 +02:00
PrivateGER
1410f8d501 Experimental: dont mark backfetched notes as silent 2024-10-05 19:17:49 +02:00
PrivateGER
b3f925c426 Fix breaking follow relationships + add warning counts to dialogue 2024-10-05 19:06:05 +02:00
Evan Paterakis
d633fe41bc
Don't depend on launcher.moe for status assets 2024-10-05 14:49:29 +03:00
Hazel K
95a0e814bc remove numeric separators 2024-10-04 09:15:12 -04:00
Hazel K
8da3b064b7 fix lint errors 2024-10-04 09:14:17 -04: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
Hazel K
3842a1ee8c fix length validation 2024-10-03 20:05:15 -04:00
Hazel K
063b2ff266 increase character limits and share between text and CW 2024-10-03 19:53:57 -04: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
Marie
4d011e7fe0
chore: change typing, remove unusued imports 2024-10-03 20:02:55 +02:00
Hazel K
97a16c2ebc Merge branch 'develop' into hazelnoot/following-timeline 2024-10-03 14:00:06 -04:00
dakkar
c2cc718f03 extract SponsorsService, use RedisKVCache
Please someone add types…
2024-10-03 18:48:11 +01:00
Marie
f6e0a04053 merge: maybe fix #510 - try to not edit visibility (!631)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/631

Closes #510

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 17:45:26 +00:00
Hazel K
40179a5591 lint fixes 2024-10-02 22:00:32 -04:00
CenTdemeern1
28aa99b273 Implement "Show Below Avatar" for Avatar Decorations 2024-10-02 23:49:30 +02:00
Hazel K
484a39c658 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 15:02:29 -04:00
Hazel K
19d7d44d0e use QueryService for blocks and mutes 2024-10-02 15:02:22 -04:00
Marie
f08ef28d54
upd: fix broken returns and change if statement 2024-10-02 19:39:06 +02:00
Marie
9dd51bc9eb
upd: fix donationUrl check position 2024-10-02 19:31:46 +02:00
Marie
6b459be117
upd: move totalSponsors and donationUrl check 2024-10-02 19:27:26 +02:00
Hazel K
d7f1e3f823 respect blocks and mutes for replies and renotes 2024-10-02 13:23:01 -04:00
Marie
34cbf55239
upd: apply suggestion 2024-10-02 19:16:54 +02:00
Hazel K
3defed6a19 fix exception when logging IP addresses 2024-10-02 12:47:01 -04:00
Marie
0897458c72
Merge branch 'develop' into upd/instancesponsor 2024-10-02 18:39:45 +02:00
Hazel K
7603ecddac respect domain mutes 2024-10-02 12:28:41 -04:00
Marie
dcd6eee627
upd: cache instance sponsors 2024-10-02 18:27:11 +02:00
Marie
3529042cb1
fix: api returns all backers on users so check if tier exists 2024-10-02 18:25:06 +02:00
Hazel K
7b2bc12ff9 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 12:18:29 -04:00
Marie
2e036d14c5
fix: sidebarLogoUrl type 2024-10-02 17:53:44 +02:00
Hazel K
705ae79eb1 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 11:45:09 -04:00
Hazel K
ef7cde6bc6 fixes from peer review 2024-10-02 11:38:21 -04:00
Marie
1e0d372eb5
upd(backend): add support for instance oc urls 2024-10-02 17:20: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
Hazel K
c0583e5d5c don't leak boost / quote / reply contents when CW is in effect 2024-10-02 00:54:35 -04:00
Hazel K
19204851a0 Revert "respect CWs in note summaries"
This reverts commit cf49701c2a.
2024-10-02 00:49:26 -04:00
Hazel K
5a36c91bf1 Revert "avoid TS errors in get-note-summary"
This reverts commit 6785996960.
2024-10-02 00:49:25 -04:00
Hazel K
2cad08001a Revert "preserve non-text details in note summaries"
This reverts commit 23659ab013.
2024-10-02 00:49:25 -04:00
Hazel K
cb10fe91bb preserve non-text details in note summaries 2024-10-01 18:28:25 -04:00
Hazel K
23659ab013 preserve non-text details in note summaries 2024-10-01 18:26:59 -04:00