bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15580 commits 1 branch 0 tags 292 MiB
Commit graph

6007 commits

Author SHA1 Message Date
tusooa
3801c47aaa
Sanitize filenames when uploading 2023-03-08 11:37:09 -06:00
marcin mikołajczak
c6c724cea1 Merge branch 'merge-pleroma' into 'develop' 
merge pleroma

See merge request soapbox-pub/rebased!229
 2023-02-04 22:39:35 +00:00
marcin mikołajczak
83bdebcaea Do not expose privileges for other users 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-02-02 21:30:38 +01:00
marcin mikołajczak
9e3468c833 Merge branch 'develop' into 'internal-webhooks' 
# Conflicts:
#   lib/pleroma/webhook.ex
 2023-01-11 09:58:50 +00:00
marcin mikołajczak
a9e3ff9af9 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2023-01-10 13:39:39 +01:00
Lain Soykaf
fe00fbfd54 B StripLocation: Add test, work for all svgs. 2023-01-05 11:29:06 -05:00
marcin mikołajczak
0b91bfc047 Merge remote-tracking branch 'soapbox/develop' into merge-pleroma 2022-12-30 21:16:10 +01:00
Atsuko Karagi
08db6765c8 Respect restrict_unauthenticated in /api/v1/accounts/lookup 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-29 23:30:04 +01:00
tusooa
4b66f2b7f1
Bump earmark to 1.4.22 2022-12-28 11:57:29 -05:00
marcin mikołajczak
43f16e6321 Add ObanHelpers.perform_all to notifications test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-24 17:37:41 +01:00
marcin mikołajczak
29bc5d6d3f delete test for destroy_multiple_from_types/2 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-24 17:30:32 +01:00
marcin mikołajczak
4b9df78df3 Add class=emoji to emojify test, related to commit 8f3e7505 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-23 20:36:34 +01:00
marcin mikołajczak
e3970f730c Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-23 19:45:55 +01:00
marcin mikołajczak
7ee63904ec Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-22 19:20:52 +01:00
Sean King
e07fb6e7dc Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges 2022-12-19 22:02:44 -07:00
lain
0840ce5671 Merge branch 'deletion-resilience' into 'develop' 
Deletion resilience

See merge request pleroma/pleroma!3237
 2022-12-20 03:07:59 +00:00
Sean King
d5d4c7c11d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges 2022-12-19 18:48:26 -07:00
lain
c6dff687c0 Merge branch 'from/upstream/develop/tusooa/mrf-updates' into 'develop' 
MRFs with Updates

See merge request pleroma/pleroma!3808
 2022-12-20 00:51:41 +00:00
Sean King
1d95012758 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges 2022-12-19 17:48:11 -07:00
lain
3dfa009ec3 Merge branch 'develop' into 'fix/2980-rss-feed-generation' 
# Conflicts:
#   CHANGELOG.md
 2022-12-19 23:43:23 +00:00
Mark Felder
72d4d1b392 Fix TwitterCard meta tags 
TwitterCard meta tags are supposed to use the attributes "name" and "content".
OpenGraph tags use the attributes "property" and "content".

Twitter itself is smart enough to detect broken meta tags and discover the TwitterCard
using "property" and "content", but other platforms that only implement parsing of TwitterCards
and not OpenGraph may fail to correctly detect the tags as they're under the wrong attributes.

> "Open Graph protocol also specifies the use of property and content attributes for markup while
> Twitter cards use name and content. Twitter’s parser will fall back to using property and content,
> so there is no need to modify existing Open Graph protocol markup if it already exists." [0]

[0] https://developer.twitter.com/en/docs/twitter-for-websites/cards/guides/getting-started
 2022-12-19 17:23:12 -05:00
Sean King
60df2d8a97
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges 2022-12-18 22:03:48 -07:00
faried nawaz
fce2998481
use to_rfc2822 instead of pub_date in tests, too 2022-12-19 01:44:47 +05:00
faried nawaz
c49316faee
modify user feed controller test to expect summary for title 2022-12-19 01:44:47 +05:00
faried nawaz
f597b1b3e6
remove ap_id test -- the element makes the feed break 2022-12-19 01:44:46 +05:00
tusooa
a3985aac91 Merge branch 'fix-2856' into 'develop' 
Uploading an avatar media exceeding max size returns a 413

Closes #2856

See merge request pleroma/pleroma!3804
 2022-12-16 16:15:36 +00:00
lain
301eb86b35 Merge branch 'update-deps' into 'develop' 
Update to Phoenix 1.6, Elixir 1.11, and chase dependencies

See merge request pleroma/pleroma!3766
 2022-12-16 00:36:59 +00:00
Lain Soykaf
bb27e4134b AudioVideoValidator: Fix embedded attachment requirements 2022-12-15 18:06:28 -05:00
Lain Soykaf
9838790a7d AttachmentValidator: Actually require url 2022-12-15 17:46:20 -05:00
tusooa
2554028097
Make SimplePolicy Update-aware 
This is inspired by d5828f1c5e
 2022-12-15 11:57:45 -05:00
tusooa
dc7efcd08b
Make TagPolicy Update-aware 
This is inspired by d5828f1c5e
 2022-12-15 11:08:24 -05:00
tusooa
62c27e0164
Fix failure when registering a user with no email when approval required 2022-12-14 01:04:42 -05:00
duponin
9876742358 Return 413 when an actor's banner or background exceeds the size limit 2022-12-11 23:15:08 +01:00
duponin
452595baed Uploading an avatar media exceeding max size returns a 413 
Until now it was returning a 500 because the upload plug were going
through the changeset and ending in the JSON encoder, which raised
because struct has to @derive the encoder.
 2022-12-11 22:54:47 +01:00
marcin mikołajczak
a30ac650bc Merge remote-tracking branch 'soapbox/develop' into post-languages 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-10 23:17:44 +01:00
Haelwenn
204fd6faae Merge branch 'from/upstream-develop/tusooa/report-fake' into 'develop' 
Report an Object, not a Create Activity

Closes #2986

See merge request pleroma/pleroma!3788
 2022-12-09 14:25:24 +00:00
tusooa
da0c684344
Add tests for flagging non-Create activities 2022-12-08 20:51:08 -05:00
Alex Gleason
ab2d8817a9
Merge remote-tracking branch 'pleroma/2061-chat-deletion' into delete-chat 2022-12-08 11:06:12 -06:00
marcin mikołajczak
61e069df72 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-12-02 23:18:19 +01:00
marcin mikołajczak
9fc7362240 Merge branch 'fix-rel-me' into 'develop' 
Add missing rel_me cache

See merge request soapbox-pub/rebased!220
 2022-12-02 21:24:08 +00:00
marcin mikołajczak
5bc4148952 fix tests? 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-02 18:03:07 +01:00
Alex Gleason
642c322388 Merge branch 'fix-remote-follow-redirect' into 'develop' 
Fix remote follow redirect

See merge request soapbox-pub/rebased!217
 2022-12-02 16:43:58 +00:00
marcin mikołajczak
f21ec80ea2 Fix race condition, update tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-01 00:34:39 +01:00
Haelwenn
3394394e0f Merge branch 'develop' into 'develop' 
Change follow_operation schema to use type BooleanLike

Closes #2999

See merge request pleroma/pleroma!3787
 2022-11-28 00:13:35 +00:00
ave
0f88c2bca4 Change follow_operation schema to use type BooleanLike 2022-11-28 00:13:34 +00:00
marcin mikołajczak
ec4b8ab4f6 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-11-27 23:34:12 +01:00
Haelwenn
36789986c0 Merge branch 'mergeback/2.4.5' into 'develop' 
Mergeback: 2.4.5

See merge request pleroma/pleroma!3794
 2022-11-27 21:24:44 +00:00
Alex Gleason
f2a1acf1a8
Fix closing a report where the reporter is deactivated 
Fixes https://gitlab.com/soapbox-pub/rebased/-/issues/133
 2022-11-27 12:10:03 -06:00
marcin mikołajczak
1d011e6ed2 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-11-27 14:09:03 +01:00
Jeremy Huffman
f531099d2d Skip two unicode/kanji tests that can't pass on Mac. 2022-11-27 03:12:34 +00:00