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
7b165deb05
api/v1/pleroma/events/joined_events
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-23 23:38:00 +01:00
e9a83d03fc
Add only_events param to timelines
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-23 20:03:42 +01:00
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
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
052d5e768a
don't use restrict_filtered twice
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-23 15:34:59 +01:00
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
55834e7517
update tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-23 00:13:06 +01:00
7510688bb1
Use correct domain for fqn and InstanceView
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-22 23:34:23 +01:00
marcin mikołajczak
eca1f581d0
Merge branch 'privacy-policy-api' into 'develop'
...
/api/v1/instance/domain_blocks endpoint
See merge request soapbox-pub/rebased!212
2022-11-21 21:01:40 +00:00
db050332cb
Do not verify links in bio
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-21 20:36:34 +01:00
0a3f523329
fix tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-21 16:28:12 +01:00
Haelwenn
7f0b3161ea
Merge branch 'akoma/deactivated-users' into 'develop'
...
Timeline query performance improvements
See merge request pleroma/pleroma!3779
2022-11-20 23:40:58 +00:00
86d1358b4f
fix
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-20 23:48:05 +01:00
27df261e54
rename tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-20 23:39:04 +01:00
b001a2c2c8
Verify link ownership with rel="me"
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-20 23:19:52 +01:00
tusooa
afe4bb2307
Fix UtilsTest
2022-11-20 01:06:21 -05:00
tusooa
9d99e76a3a
Fix unit tests
2022-11-20 00:57:04 -05:00
tusooa
0e0c316c76
Fix report api
2022-11-20 00:35:52 -05:00
tusooa
a69e9ae2ef
Flag an Object, not an Activity
2022-11-19 23:51:43 -05:00
feld
f40ccce7e9
Merge branch 'quack-docs' into 'develop'
...
Remove Quack from docs and cheatsheet
See merge request pleroma/pleroma!3786
2022-11-18 16:38:08 +00:00
Mark Felder
c7a0df8006
Remove Quack from docs and cheatsheet
2022-11-18 10:09:52 -05:00
feld
bb63f72c11
Merge branch 'flash-support-csp' into 'develop'
...
Reduce CSP policy to make Ruffle work on chrome
See merge request pleroma/pleroma!3389
2022-11-17 17:29:36 +00:00
Mark Felder
cddcafee7f
Document inclusion of wasm-unsafe-eval
2022-11-17 12:03:29 -05:00
HJ
a31d3589ed
Update http_security_plug.ex
2022-11-17 12:03:01 -05:00
HJ
79bd363a68
Update lib/pleroma/web/plugs/http_security_plug.ex
2022-11-17 12:03:01 -05:00
Henry Jameson
db76ea578a
try to fix ruffle on chrome
2022-11-17 12:03:01 -05:00
marcin mikołajczak
4f61f19f56
Merge branch 'merge-pleroma' into 'develop'
...
Merge pleroma/develop
See merge request soapbox-pub/rebased!213
2022-11-15 23:06:39 +00:00
2e7a713e58
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-16 00:06:25 +01:00
b7879d58f3
Merge remote-tracking branch 'pleroma/develop' into HEAD
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-15 23:27:58 +01:00
1175127549
Only keep domain_blocks for now
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-14 19:41:40 +01:00
9126ba7695
Add domain_blocks and extended_description endpoints
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-14 16:31:53 +01:00
feld
a9d991d31e
Merge branch 'develop' into 'akoma/deactivated-users'
...
# Conflicts:
# CHANGELOG.md
2022-11-14 14:03:11 +00:00
f9dfe64ba4
Privacy policy API
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-14 14:28:58 +01:00
