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

15799 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn (lanodan) Monnier
1eb3ce956b Add Gitlab Release™ into Release MR template 2022-11-28 22:08:47 +01:00
Haelwenn
d8e326467c Merge branch 'fix/2.4.5-release-date' into 'stable' 
Fix changelog date

See merge request pleroma/pleroma!3796
 2022-11-28 04:35:51 +00:00
Sean King
75c9f7770f
Fix changelog date 2022-11-27 20:17:48 -07:00
Haelwenn
20790c1dd3 Merge branch 'mergeback/2.4.5' into 'develop' 
CHANGELOG.md: Fix date for 2.4.5

See merge request pleroma/pleroma!3795
 2022-11-28 02:31:18 +00: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 (lanodan) Monnier
d6cd447cfa CHANGELOG.md: Fix date for 2.4.5 2022-11-27 22:28:48 +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
Haelwenn
76bdb01c18 Merge branch 'release/2.4.5' into 'stable' 
Release 2.4.5

See merge request pleroma/pleroma!3793
 2022-11-27 21:24:19 +00:00
Alex Gleason
7a14517763 Merge branch 'fix-close-reports' into 'develop' 
Fix closing a report where the reporter is deactivated

Closes #133

See merge request soapbox-pub/rebased!219
 2022-11-27 18:34:37 +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
7fa342bd76 Cleanup, language detection 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-27 19:08:50 +01:00
marcin mikołajczak
0424697a2e mix format 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-27 15:28:29 +01:00
marcin mikołajczak
1edda97964 Add Geospatial config to description.exs 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-27 15:28:13 +01:00
marcin mikołajczak
1d011e6ed2 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-11-27 14:09:03 +01:00
marcin mikołajczak
58c70c88c2 Only allow valid content types, again 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-27 14:08:58 +01:00
Haelwenn (lanodan) Monnier
f6d55e1e77 Mergeback of release 2.4.5 2022-11-27 13:20:42 +01:00
Haelwenn (lanodan) Monnier
2614f431b9 Release 2.4.5 2022-11-27 13:17:21 +01:00
Hélène
542bb17258 ArticleNotePageValidator: fix replies fixing 
Some software, like GoToSocial, expose replies as ActivityPub
Collections, but do not expose any item array directly in the object,
causing validation to fail via the ObjectID validator. Now, Pleroma will
drop that field in this situation too.
 2022-11-27 04:54:19 +01:00
FloatingGhost
747311f623 fix resolution of GTS user keys 2022-11-27 04:54:18 +01:00
Tusooa Zhu
11d5ad24c5 Make local-only posts stream in local timeline 2022-11-27 04:39:32 +01:00
Tusooa Zhu
e46c3a0595 Do not stream out Create of ChatMessage 2022-11-27 04:39:32 +01:00
Sean King
9b68778887 Fix fedi-fe build URL 2022-11-27 04:34:33 +01:00
Haelwenn (lanodan) Monnier
f2221d539c script_test: Fix %ErlangError for Elixir 1.14 2022-11-27 04:25:48 +01:00
Haelwenn (lanodan) Monnier
915c7319c6 mix: Switch prometheus_ex to fix/elixir-1.14 branch 2022-11-27 04:25:48 +01:00
Haelwenn (lanodan) Monnier
f12ddcd697 timeline_controller_test: Fix test name for elixir 1.14 2022-11-27 04:25:48 +01:00
Tusooa Zhu
09ab51eebb Make mutes and blocks behave the same as other lists 2022-11-27 04:21:58 +01:00
Haelwenn (lanodan) Monnier
7ec3469bea Transmogrifier: Use validating regex for "mediaType" 2022-11-27 04:21:31 +01:00
Haelwenn (lanodan) Monnier
8640d217b1 AttachmentValidator: Use custom ecto type and regex for "mediaType" 2022-11-27 04:21:31 +01:00
Haelwenn (lanodan) Monnier
da71092003 EctoType: Add MIME validator 2022-11-27 04:21:31 +01:00
Ilja
4504c81080 Delete report notifs when demoting from superuser 
When someone isn't a superuser any more, they shouldn't see the reporsts any more either.
Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
 2022-11-27 04:20:11 +01:00
Haelwenn
3b289a1643 Merge branch 'skip-kanji-mac' into 'develop' 
Skip two unicode/kanji tests that can't pass on Mac.

See merge request pleroma/pleroma!3791
 2022-11-27 03:12:34 +00:00
Jeremy Huffman
f531099d2d Skip two unicode/kanji tests that can't pass on Mac. 2022-11-27 03:12:34 +00:00
Haelwenn (lanodan) Monnier
508b438b53 scrubbers: Scrub img class attribute 
Closes: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3790
 2022-11-27 04:04:17 +01:00
Haelwenn (lanodan) Monnier
8f3e750530 scrubbers: Scrub img class attribute 
Closes: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3790
 2022-11-27 03:40:21 +01:00
Alex Gleason
cce9083282 Merge branch 'disable-inline-images' into 'develop' 
Disable inline images

See merge request soapbox-pub/rebased!218
 2022-11-26 23:16:56 +00:00
Alex Gleason
2714e770c7
Allow inline images in tests (for now) 2022-11-26 17:07:15 -06:00
Alex Gleason
6d4f99d9b3
Disable inline images 2022-11-26 16:21:15 -06:00
Alex Gleason
2899feb4d9
Fix remote follow redirect 2022-11-26 13:57:08 -06:00
marcin mikołajczak
7b165deb05 api/v1/pleroma/events/joined_events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 23:38:00 +01:00
marcin mikołajczak
e9a83d03fc Add only_events param to timelines 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 20:03:42 +01:00
marcin mikołajczak
92716dd605 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 20:01:51 +01:00
marcin mikołajczak
adfbd3d756 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-11-23 19:50:09 +01:00
marcin mikołajczak
13c61e59e7 Merge branch 'merge-pleroma' into 'develop' 
Merge pleroma/develop

See merge request soapbox-pub/rebased!216
 2022-11-23 16:08:38 +00:00
marcin mikołajczak
32bcd7fdf6 Merge branch 'link-verification' into 'develop' 
Verify link ownership with rel="me"

See merge request soapbox-pub/rebased!214
 2022-11-23 16:08:36 +00:00
marcin mikołajczak
052d5e768a don't use restrict_filtered twice 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 15:34:59 +01:00
marcin mikołajczak
1d6b91c071 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 15:33:54 +01:00
marcin mikołajczak
5866789d46 Merge branch 'webfinger-fix' into 'develop' 
Use correct domain for fqn and InstanceView

See merge request soapbox-pub/rebased!215
 2022-11-22 23:31:52 +00:00
marcin mikołajczak
55834e7517 update tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-11-23 00:13:06 +01:00