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
Alex Gleason
ab2d8817a9
Merge remote-tracking branch 'pleroma/2061-chat-deletion' into delete-chat
2022-12-08 11:06:12 -06:00
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
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
f21ec80ea2
Fix race condition, update tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-01 00:34:39 +01:00
ec4b8ab4f6
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
2022-11-27 23:34:12 +01: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
1d011e6ed2
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
2022-11-27 14:09:03 +01: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
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
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
55834e7517
update tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-23 00:13:06 +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
0a3f523329
fix tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-21 16:28:12 +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
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
f9dfe64ba4
Privacy policy API
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-14 14:28:58 +01:00
lain
0e1356ef9c
Merge branch 'akkoma/delete-improvements' into 'develop'
...
Alter priority of Delete activities to be lowest
See merge request pleroma/pleroma!3782
2022-11-14 07:24:46 +00:00
lain
76ed0da09f
Merge branch 'bugfix/reset-unreachable-on-fetch' into 'develop'
...
Object.Fetcher: Set reachable on successful fetch
See merge request pleroma/pleroma!3780
2022-11-14 07:22:33 +00:00
Mark Felder
2e0089dd5c
Alter priority of Delete activities to be lowest
...
This will prevent a user with a large number of posts from negatively affecting performance of the outgoing federation queue if they delete their account.
2022-11-13 14:11:48 -05:00
Haelwenn
a2db64b12b
Merge branch 'fix-typo-in-csp-report-to-header-name' into 'develop'
...
Fix typo in CSP Report-To header name
See merge request pleroma/pleroma!3768
2022-11-13 18:53:59 +00:00
Haelwenn (lanodan) Monnier
b2713357b9
Object.Fetcher: Set reachable on successful fetch
2022-11-13 16:51:12 +01:00
tusooa
1b0e47b79b
Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
...
Give admin the choice to not strip reported statuses
Closes #2887
See merge request pleroma/pleroma!3773
2022-11-12 17:55:50 +00:00
tusooa
7991364380
Lint
2022-11-11 18:32:08 -05:00
Mark Felder
6b87b3f2ea
Remove Quack logging backend
2022-11-11 12:36:29 -05:00
tusooa
717c5901f8
Render a generated reported activity properly
2022-11-09 23:02:27 -05:00
tusooa
6f047cc308
Do not strip reported statuses when configured not to
2022-11-09 22:36:57 -05:00
8661703c16
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-09 17:08:18 +01:00
c9e9f25f00
Merge remote-tracking branch 'soapbox/develop' into post-languages
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-08 23:11:05 +01:00
1553b651dc
Add supported languages list to /api/v2/instance
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-08 23:09:42 +01:00
Alex Gleason
272e022a71
OpenGraphTest: fix MediaProxy URL
2022-11-06 13:27:45 -06:00
Alex Gleason
28c8948765
Merge branch 'reject-anon-report' into 'develop'
...
Add RemoteReportPolicy to reject reports without enough information
See merge request soapbox-pub/rebased!202
2022-11-06 14:39:06 +00:00
Alex Gleason
04fe485015
Merge branch 'remove-shout' into 'develop'
...
Remove Shout feature
See merge request soapbox-pub/rebased!200
2022-11-06 14:11:39 +00:00
marcin mikołajczak
6500fee83f
Merge branch 'post-languages' into 'develop'
...
Allow to specify post language, add content translations and language auto-detection
See merge request soapbox-pub/rebased!196
2022-11-05 22:08:34 +00:00
4f042374d8
Deepl: use :base_url
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-05 21:41:58 +01:00
2c62043ef9
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-05 21:08:08 +01:00
Alex Gleason
3957167a9d
RemoteReportPolicy: add :reject_all option, fix tests
2022-11-05 14:07:37 -05:00
Alex Gleason
87e9bbf86c
Add RemoteReportPolicy to reject reports without enough information
2022-11-05 13:56:56 -05:00
0c1eaf2634
Add contact account to InstanceView
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-05 13:05:14 +01:00
6649eb84a2
Add all 639-1 languages to @supported_locales
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-04 21:54:20 +01:00
ade5796337
Improve getting language from context, add more tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-04 20:52:25 +01:00
