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
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
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
e86ca8a436
Merge branch 'weblate' into 'develop'
...
Translations update from Pleroma Weblate
See merge request pleroma/pleroma!3772
2022-11-13 18:53:12 +00:00
Mark Felder
47b9847edd
Deletes do not generate notifications of any kind, so skip trying
2022-11-13 12:25:52 -05:00
Haelwenn (lanodan) Monnier
b2713357b9
Object.Fetcher: Set reachable on successful fetch
2022-11-13 16:51:12 +01:00
Mark Felder
39b24cdce6
Document query performance improvement
2022-11-12 18:32:49 -05:00
Mark Felder
edaf0a05f8
Add same optimized join for excluding invisible users
2022-11-12 18:06:28 -05:00
Mark Felder
749445dd50
Fix reports which do not have a user
...
The check for deactivated users was being applied to report activities.
2022-11-12 17:54:11 -05:00
FloatingGhost
4d321be05c
Extract deactivated users query to a join
2022-11-12 17:52:28 -05:00
Dmytro Poltavchenko
451c415fca
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (95 of 95 strings)
Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/uk/
2022-11-12 22:13:38 +00:00
Dmytro Poltavchenko
1c97a86b8d
Added translation using Weblate (Ukrainian)
2022-11-12 22:13:38 +00:00
Dmytro Poltavchenko
3979eaf14a
Added translation using Weblate (Ukrainian)
2022-11-12 22:13:38 +00:00
feld
3d1828f43b
Merge branch 'oban-timeouts' into 'develop'
...
Define sane Oban Worker timeouts
See merge request pleroma/pleroma!3777
2022-11-12 22:13:28 +00:00
tusooa
f38cb4ccac
Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
...
Lint
See merge request pleroma/pleroma!3778
2022-11-12 19:48:26 +00:00
tusooa
14871fecd4
Lint
2022-11-12 14:16:52 -05: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
e3e68b9377
Update config cheatsheet
2022-11-12 12:55:02 -05:00
Haelwenn
c2cfe0c690
Clarify config description
2022-11-12 17:44:31 +00:00
