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
tusooa
1036acb6ae
Merge branch 'release-template' into 'develop'
...
Add Gitlab Release™ into Release MR template
See merge request pleroma/pleroma!3797
2022-12-06 20:41:22 +00:00
lain
633a76b5b3
Merge branch 'jrabbit-develop-patch-67125' into 'develop'
...
Upgrade docs improvement: reccomend tagged releases over pulling stable branch
See merge request pleroma/pleroma!3800
2022-12-06 20:13:55 +00:00
jrabbit
8afad1e46e
reccomend tagged releases over pulling stable
2022-12-06 17:24:04 +00:00
Haelwenn
f60cb0f771
Merge branch 'ci/amd64-build-tags' into 'develop'
...
CI: Tag amd64 releases for amd64 runners
See merge request pleroma/pleroma!3799
2022-12-05 23:33:46 +00:00
Haelwenn
eb7f4bc51b
Merge branch 'weblate' into 'develop'
...
Translations update from Pleroma Weblate
See merge request pleroma/pleroma!3798
2022-12-05 23:15:44 +00:00
Haelwenn (lanodan) Monnier
b6e96f63b4
CI: Tag amd64 releases for amd64 runners
2022-12-06 00:08:55 +01:00
Xnuk Shuman
3e8f49be67
Added translation using Weblate (Korean)
2022-12-01 17:17:03 +00:00
Haelwenn (lanodan) Monnier
1eb3ce956b
Add Gitlab Release™ into Release MR template
2022-11-28 22:08:47 +01: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
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 (lanodan) Monnier
f6d55e1e77
Mergeback of release 2.4.5
2022-11-27 13:20:42 +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
8f3e750530
scrubbers: Scrub img class attribute
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3790
2022-11-27 03:40:21 +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
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
feld
a9d991d31e
Merge branch 'develop' into 'akoma/deactivated-users'
...
# Conflicts:
# CHANGELOG.md
2022-11-14 14:03:11 +00: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