Commit graph

9429 commits

Author SHA1 Message Date
marcin mikołajczak
7c28e26535 Display last_status_at in masto date format 2023-07-12 18:32:26 +00:00
4e0e5ce463 Fix tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-09 19:30:54 +02:00
5f5e95ebcd Lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-09 19:10:19 +02:00
ba8c734818 Familiar followers query
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-09 19:03:06 +02:00
7579332262 Merge remote-tracking branch 'soapbox/develop' into familiar_followers
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-09 18:46:04 +02:00
marcin mikołajczak
cb7002b6c3 Move admin routes outside wrong role 2023-06-20 18:06:53 +00:00
Alex Gleason
e8928e2295 Merge branch 'merge-pleroma' into 'develop'
Merge Pleroma

See merge request soapbox-pub/rebased!247
2023-06-07 21:50:27 +00:00
Mark Felder
bc2fe1b672
Revert MediaProxy Host header validation
Something is going wrong here even though the tests are correct.
2023-06-07 10:26:36 -05:00
Alex Gleason
b7b428eb59 Merge branch 'spam-mrf-fix3' into 'develop'
AntiMentionSpamPolicy: remove followers check

See merge request soapbox-pub/rebased!252
2023-06-05 20:49:36 +00:00
Mark Felder
bf5fa7d193
Switch to filtering out various xml and html types by focusing on the subtype 2023-06-05 15:43:39 -05:00
Mark Felder
478f899e76
Fix scrubbing for files served by Plug.Static
Using this :headers option we can rewrite the content-type before the conn is halted
2023-06-05 15:43:30 -05:00
Mark Felder
a2ee5e4ccf
Scrub content-type of uploaded media before serving 2023-06-05 15:43:26 -05:00
Alex Gleason
944fd73b36
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2023-06-05 15:38:19 -05:00
Haelwenn
d998a114e2 Merge branch 'validate-host' into 'develop'
Validate Host header for MediaProxy and Uploads

See merge request pleroma/pleroma!3896
2023-05-31 00:50:01 +00:00
Mark Felder
b3c3bd99c3 Switch from serving a 400 to a 302 2023-05-30 16:56:09 -04:00
Mark Felder
9caa0b0be1 Add OnlyMedia Upload Filter to simplify restricting uploads to audio, image, and video types 2023-05-29 15:49:04 -04:00
Mark Felder
da7394f33b Fix unused assignment 2023-05-29 15:09:31 -04:00
Mark Felder
a60dd0d92d Validate Host header matches expected value before allowing access to Uploads 2023-05-29 14:16:03 -04:00
Mark Felder
843fcca5b4 Validate Host header matches expected value before allowing access to MediaProxy 2023-05-29 13:59:51 -04:00
a1567f2c68 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-27 01:33:43 +02:00
c7309f723c Add route to revoke all tokens
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-27 00:06:45 +02:00
Haelwenn (lanodan) Monnier
869f0d24a6 Merge branch 'release/2.5.2' into mergeback/2.5.2 2023-05-26 23:47:50 +02:00
Mark Felder
4505bc1e58 Filter OEmbed HTML tags 2023-05-26 19:56:36 +02:00
Mark Felder
0d68804aa7 Filter OEmbed HTML tags 2023-05-26 19:54:24 +02:00
tusooa
d0c2e0830b Enforce unauth restrictions for public streaming endpoints 2023-05-26 19:24:08 +02:00
Haelwenn
b36263e5ff Merge branch 'issue/3126' into 'develop'
MediaProxyController: Apply CSP sandbox

See merge request pleroma/pleroma!3890
2023-05-26 19:24:08 +02:00
Haelwenn
4339230f64 Merge branch 'tusooa/fix-object-test' into 'develop'
Fix ObjectTest

See merge request pleroma/pleroma!3887
2023-05-26 19:24:08 +02:00
Haelwenn
72833c84b5 Merge branch 'tusooa/rework-refetch' into 'develop'
Make sure object refetching follows update rules

See merge request pleroma/pleroma!3883
2023-05-26 19:24:08 +02:00
Mark Felder
38bcf6b19e MediaProxyController: Apply CSP sandbox 2023-05-26 12:34:01 -04:00
Alex Gleason
0b2f8ed96d
AntiMentionSpamPolicy: remove followers check 2023-05-22 15:50:34 -05:00
tusooa
819a82da99
Fix unused variable 2023-05-22 08:19:58 -04:00
tusooa
505e58d4eb
Fix ObjectTest 2023-05-22 08:14:20 -04:00
Alex Gleason
7e375cbdd1
AntiMentionSpamPolicy: fix user age check 2023-05-21 19:31:56 -05:00
Alex Gleason
54f2c37e10
AntiDuplicationPolicy: fix accidentally returning the inner object 2023-05-21 16:27:42 -05:00
Alex Gleason
7adead8df8
AntiDuplicationPolicy: fix messing up Announces 2023-05-21 16:12:33 -05:00
Alex Gleason
c0a0d6bb43
Add AntiMentionSpamPolicy 2023-05-21 15:26:02 -05:00
Alex Gleason
f2cf4941ee
Add AntiDuplicationPolicy 2023-05-21 14:12:53 -05:00
Haelwenn
0524e66a05 Merge branch 'accept-tags-2.5' into 'develop'
TagValidator: Drop unrecognized Tag types

Closes #2952

See merge request pleroma/pleroma!3823
2023-05-17 19:04:51 +00:00
Haelwenn
ce1c0f75cd Merge branch 'tusooa/3065-scopes' into 'develop'
OAuth scopes descriptions

Closes #3065

See merge request pleroma/pleroma!3848
2023-05-17 18:51:26 +00:00
Alex Gleason
6d1da90e2b Apply 1 suggestion(s) to 1 file(s) 2023-05-13 13:21:37 +00:00
33240c8604 Implement /api/v1/instance/translation_languages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-13 13:23:54 +02:00
tusooa
e170fc40dd
Fix build warning 2023-05-09 21:38:28 -04:00
tusooa
be5c5118cb
Make sure object refetching follows update rules 2023-05-09 21:04:27 -04:00
94cdedc6c9 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-09 22:27:06 +02:00
a12735fba0 lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-08 21:54:08 +02:00
tusooa
6d0ebccdb0
Make webui use translated scope descriptions 2023-05-02 16:32:33 -04:00
tusooa
85bdbb102e
Add extraction process for oauth scopes 2023-05-02 16:32:10 -04:00
7de0b2f2c8 Expose markup configuration in InstanceView
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-30 17:33:11 +02:00
tusooa
248f914e6e Merge branch 'list-installed-frontends' into 'develop'
List installed frontend refs in admin API

See merge request pleroma/pleroma!3862
2023-04-27 02:56:19 +00:00
tusooa
ddf57596be Merge branch 'bugfix/content-disposition' into 'develop'
UploadedMedia: Add missing disposition_type to Content-Disposition

Closes #3114

See merge request pleroma/pleroma!3873
2023-04-26 15:39:20 +00:00