Commit Graph

26785 Commits

Author SHA1 Message Date
dakkar 2a4e26c05f update list of project members 2024-03-04 20:35:57 +00:00
Amelia Yukii 1e658ee04d merge: fix repo + feedback URLs for Firefish / IceShrimp (!450)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/450

Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 20:22:49 +00:00
Amelia Yukii 5988c5fa70 merge: rough start of a Sharkey contributors' guide - #241 (!394)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/394

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 20:21:47 +00:00
dakkar ad2a97f20f rough start of a Sharkey contributors' guide - #241 2024-03-04 20:21:46 +00:00
Amelia Yukii 061cc40384 merge: allow lookup / search for `http` URLs (!457)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/457

Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 20:20:53 +00:00
Amelia Yukii 5733190b37 merge: Fixed english translation for the "Delete File" button (!458)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/458

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 18:48:05 +00:00
Leah e7c41927e2 Fixed english translation for the "Delete File" button 2024-03-04 18:48:04 +00:00
Amelia Yukii 421f1d46a2 merge: Fixed startup crash with seasonal effects (!459)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/459

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-03-04 18:47:47 +00:00
Leah eba0c2cc61 Fixed startup crash with seasonal effects 2024-03-04 18:47:47 +00:00
jaina heartles bd11dabf89 Reject DMs where recipients don't match mentions 2024-03-03 21:09:39 -08:00
jaina heartles 3f92fcb96e bump version 2024-03-03 20:35:07 -08:00
jaina heartles 45e5f5fa1e Add warning when a cwed post has insensitive attachments 2024-03-03 20:34:49 -08:00
jaina heartles aa0c98adcf Hide reversi games in secureApiMode 2024-03-03 17:12:20 -08:00
jaina heartles 27e6714827 Create requireCredentialSecureMode
`requireCredentialSecureMode` is a replacement for `requireCredential` as
a three-valued enum. Keeping `requireCredential` as a boolean makes future
merges easier, and whether the endpoint should be allowed in secure mode
is determined by `requireCredentialSecureMode`. This implies that
`requireCredential: true, requireCredentialSecureMode: false` is an invalid
value.
2024-03-03 16:51:39 -08:00
jaina heartles 2e8420d2e9 Merge tag 'tags/2024.3.1' 2024-03-03 13:16:27 -08:00
dakkar 96d8432b85 allow lookup / search for `http` URLs 2024-03-03 14:45:34 +00:00
dakkar 03464cc379 always align code to the left - fixes #436
"featured notes" on the welcome page's right-hand column are shown
with the text right-aligned; code should not be affected by that. This
makes sure it isn't
2024-03-03 12:06:22 +00:00
dakkar ebe8179c9e save and restore UI language together with other prefs - fixes #443 2024-03-03 11:23:49 +00:00
dakkar 7d00c4529b fix repo + feedback URLs for Firefish / IceShrimp 2024-03-03 11:12:58 +00:00
dakkar 2cad97c1ab merge: release 2024.3.1 (!449)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/449

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-03-02 17:43:24 +00:00
dakkar 6ecfe7c7c3 remove duplicate method 2024-03-02 17:34:31 +00:00
dakkar 23f476dbf3 Merge branch 'develop' into release/2024.3.1 2024-03-02 17:28:34 +00:00
Amelia Yukii 2e55108b6b merge: put back the readme (!447)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/447

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-03-02 16:50:34 +00:00
dakkar 83fa276483 put back the readme 2024-03-02 16:49:02 +00:00
Amelia Yukii 46c664348e merge: merge upstream for 2024.2.1 (!446)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/446

Closes #434

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-03-02 16:36:49 +00:00
dakkar af548d05ca merge upstream for 2024.2.1 2024-03-02 16:36:49 +00:00
jaina heartles 241d123fc4 bump version 2024-02-27 14:59:25 -08:00
jaina heartles 1c50079f7b Allow pinning/unpinning other users posts 2024-02-27 14:57:27 -08:00
jaina heartles 401376d668 Fix restriction on excludeReplies and excludeNoFiles 2024-02-27 14:50:13 -08:00
jaina heartles 6e0f7195b3 Remove withReplies NAND withFiles check 2024-02-27 14:13:48 -08:00
jaina heartles 86a77a9dba bump version 2024-02-26 21:38:22 -08:00
jaina heartles 3ae5cfd720 Change icons for like and favorite
"Like" will now use a star emoji, like mastodon's faves
"Favorite" will now use a bookmark emoji, since it functions as a bookmark
2024-02-26 21:36:53 -08:00
jaina heartles 6ecb0dcacf bump version 2024-02-26 11:33:57 -08:00
jaina heartles b75006ff10 Change default reaction emoji 2024-02-26 11:33:50 -08:00
Amelia Yukii eab7d5bd27 merge: Fix Images in ReadMe (!445)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/445

Approved-by: Marie <marie@kaifa.ch>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-25 23:59:05 +00:00
Amelia Yukii 8e8a9d3835 Fix Images in ReadMe 2024-02-25 21:57:12 +00:00
jaina heartles b9764e5a73 bump version 2024-02-25 13:40:37 -08:00
jaina heartles 74a62c2107 Merge branch 'feature-allowlist' into egirls-sharkey 2024-02-24 14:33:24 -08:00
jaina heartles 9dcc7645ea Allowlist implementation 2024-02-24 14:33:12 -08:00
Amelia Yukii 7a1251423f merge: Add missing IMPORTANT_NOTES.md from Sharkey/OldJoinSharkey (!443)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/443

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-24 18:20:48 +00:00
Marie 7f5492a395 Add missing IMPORTANT_NOTES.md from Sharkey/OldJoinSharkey 2024-02-24 18:20:48 +00:00
Marie 2fa0e238b7 merge: Update index.vue - Also check enableMcaptcha for noBotProtection (!442)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/442

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-02-24 18:16:43 +00:00
Marie 1b65c06d60 merge: fix: delete old follow request (if exists) before creating new (!440)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-02-24 18:16:16 +00:00
Marie d539dec8b1 merge: Merge upstream changes from 23rd of Feburary (!439)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/439

Closes #431

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-24 18:16:06 +00:00
Ashley Graves 17df852c33 Update index.vue - I'm dumb sorry 2024-02-24 17:15:24 +00:00
Ashley Graves f3ca342318 Update index.vue - Also check enableMcaptcha for noBotProtection 2024-02-24 17:12:53 +00:00
Kaity A def2e8dff0
Merge remote-tracking branch 'origin/develop' into fix/failed-follow 2024-02-24 05:05:25 +00:00
Kaity A ea948ccadc
fix: delete old follow request (if exists) before creating new 2024-02-24 04:38:01 +00:00
jaina heartles 83880096b2 Lock off public HTML 2024-02-23 12:27:13 -08:00
jaina heartles acec9de658 Allow securing public api 2024-02-23 12:04:47 -08:00