sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
14,528 Commits 136 Branches 24 Tags 261 MiB
Commit Graph

2059 Commits

Author SHA1 Message Date
Your New SJW Waifu 86744609d7 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-05-10 18:17:41 -05:00
Haelwenn 4605efe272 Merge branch 'improve_anti_followbot_policy' into 'develop' 
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy

Closes #2561

See merge request pleroma/pleroma!3498
 2022-05-08 18:10:40 +00:00
Ilja a8093732bd Also use actor_type to determine if an account is a bot in antiFollowbotPolicy 2022-05-08 18:10:40 +00:00
Your New SJW Waifu f53d289b51 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-05-06 22:31:08 -05:00
Tusooa Zhu 57c030a0a7 Skip cache when /objects or /activities is authenticated 
Ref: fix-local-public
 2022-05-06 10:23:26 +02:00
Your New SJW Waifu 3348e4bd1d Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-03-08 15:03:32 -06:00
Sean King 17aa3644be
Copyright bump for 2022 2022-02-25 23:11:42 -07:00
Your New SJW Waifu 13093739a2 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-03 08:16:51 -06:00
marcin mikołajczak f8f2a17754 Birthdays: Fix outgoing federation of birth dates 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-01 12:00:26 +01:00
Alex Gleason 3bf257171f
ForceMentionsInContent: improve display of Markdown posts 2022-01-27 14:15:06 -06:00
Alex Gleason 27cb3d6273
ForceMentionsInContent: don't apply it to top-level posts 2022-01-26 21:24:26 -06:00
bot a4de79ced0 ForceBotUnlistedPolicy: fix to stop unlisting my posts >:( 2022-01-26 22:53:02 +00:00
Alex Gleason 0604b0dd09
ForceMentionsInContent: don't mention self 2022-01-25 12:33:47 -06:00
Alex Gleason 0f4e0e667e Merge branch 'recipients-inline' into 'develop' 
ForceMentionsInContent: wrap mentions in a span, fix the formatting

See merge request pleroma/pleroma!3620
 2022-01-25 17:43:39 +00:00
Alex Gleason 65b4d2ce84
ForceMentionsInContent: fix order of mentions 2022-01-25 10:42:34 -06:00
Alex Gleason 267184b70e
ForceMentionsInContentTest: return mentions in a not terrible format 2022-01-24 20:03:43 -06:00
Alex Gleason c5a20c80c4
ForceMentionsInContent: simplify finding users 2022-01-24 19:44:44 -06:00
Alex Gleason d5644a52aa
ForceMentionsInContent: wrap inline mentions with span tag 2022-01-24 19:11:45 -06:00
Alex Gleason 1bbc701a3a
ForceMentionsInContent: use `to` instead of `tag` 2022-01-24 19:11:14 -06:00
Your New SJW Waifu 87d6b9aeb0 Revert "Merge remote-tracking branch 'upstream/quote-post' into neckbeard" 
This reverts commit f7bd1bd5ff, reversing
changes made to b762792837.
 2022-01-24 08:16:23 -06:00
Your New SJW Waifu f7bd1bd5ff Merge remote-tracking branch 'upstream/quote-post' into neckbeard 2022-01-24 07:59:48 -06:00
Your New SJW Waifu b762792837 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-23 11:19:53 -06:00
marcin mikołajczak 0266bc3c96 Birthdays: hide_birthday -> show_birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-23 09:13:33 +01:00
Alex Gleason 69cab8da89
ActivityDraft: allow quoting 2022-01-22 22:15:54 -06:00
Alex Gleason 04709e1a27
Transmogrifier: fix quoteUrl here too 2022-01-22 19:14:39 -06:00
Alex Gleason fbdfeb326d
Transmogrifier: fetch quoted post 2022-01-22 18:46:58 -06:00
Alex Gleason 0f34eb60d4
ObjectValidators: improve quoteUrl compatibility 2022-01-22 18:03:22 -06:00
Alex Gleason c6ff668b1d
ObjectValidators: accept "quoteUrl" field 2022-01-22 16:41:51 -06:00
Alex Gleason aaa9314f4c
Merge remote-tracking branch 'origin/develop' into birth-dates 2022-01-22 14:24:50 -06:00
Alex Gleason 66e8c6f90f
Birthdays: birth_date --> birthday 2022-01-22 13:21:55 -06:00
Alex Gleason 6ffe43af70 Merge branch 'private-pins' into 'develop' 
Support private pinned posts from Mastodon

See merge request pleroma/pleroma!3611
 2022-01-20 23:18:24 +00:00
marcin mikołajczak 88c21b9282 Support private pinned posts from Mastodon 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-20 12:35:32 +01:00
rinpatch a02cfd7f52 Add ForceMentionsInContentPolicy 
Even though latest PleromaFE supports displaying these properly, mobile
apps still exist, so I think we should offer a workaround to those who
want it.
 2022-01-19 21:04:57 +03:00
marcin mikołajczak c180f9276f check if remote bday is valid 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-19 17:19:28 +01:00
marcin mikołajczak b108b05650 Birth dates, birthday reminders API, allow instance admins to require minimum age 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-01-18 14:57:48 +01:00
Your New SJW Waifu e70a8107fa Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-12-30 10:40:51 -06:00
marcin mikołajczak de006443f0 MastoAPI: Profile directory 2021-12-26 02:35:17 +00:00
Alex Gleason d9746ae4cb Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop' 
Handle Reject for already-accepted Follows properly

Closes #2766 and #2802

See merge request pleroma/pleroma!3568
 2021-12-23 16:00:16 +00:00
Alex Gleason df5359aa72 Merge branch 'replies-count' into 'develop' 
Fix replies count for remote replies

See merge request pleroma/pleroma!3541
 2021-12-19 17:36:25 +00:00
Tusooa Zhu 3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2 
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
 2021-12-17 14:17:51 -05:00
Your New SJW Waifu 5729034482 update host and uploads location 2021-12-14 07:17:24 -06:00
Your New SJW Waifu 68278ab5bd Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-12-14 06:57:13 -06:00
Alex Gleason 2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions 2021-12-07 13:41:54 -05:00
Alex Gleason 3f03d71ea6
AttachmentValidator: ingest width and height 2021-12-07 12:59:03 -05:00
Lain Soykaf ca8c676867 Linting. 2021-12-07 12:12:23 -05:00
Finn Behrens 8af53101fb move result into with guard 2021-12-07 09:18:53 +01:00
Your New SJW Waifu addea8fdfe Update racism_remover.ex 2021-12-04 20:05:12 +00:00
marcin mikołajczak d64d1b1d45 Fix replies count for remote replies 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-11-23 11:31:09 +01:00
lain e2772d6bf1 Merge branch 'block-behavior' into 'develop' 
Configurable block visibility, fixes #2123

Closes #2123

See merge request pleroma/pleroma!3242
 2021-11-15 14:27:59 +00:00
Haelwenn (lanodan) Monnier 23e91ec8dd activity_pub_controller: Fix misleading debug warning in post_inbox_fallback 2021-11-10 01:11:35 +01:00