tusooa
a3985aac91
Merge branch 'fix-2856' into 'develop'
...
Uploading an avatar media exceeding max size returns a 413
Closes #2856
See merge request pleroma/pleroma!3804
2022-12-16 16:15:36 +00:00
lain
301eb86b35
Merge branch 'update-deps' into 'develop'
...
Update to Phoenix 1.6, Elixir 1.11, and chase dependencies
See merge request pleroma/pleroma!3766
2022-12-16 00:36:59 +00:00
lain
c0cfc454ba
Merge branch 'from/upstream-develop/tusooa/register-approval' into 'develop'
...
Fix failure when registering a user with no email when approval required
Closes #3021
See merge request pleroma/pleroma!3807
2022-12-15 23:07:49 +00:00
Lain Soykaf
bb27e4134b
AudioVideoValidator: Fix embedded attachment requirements
2022-12-15 18:06:28 -05:00
Lain Soykaf
4a32b584e1
StatusView: Fix warning
2022-12-15 18:02:33 -05:00
Lain Soykaf
9838790a7d
AttachmentValidator: Actually require url
2022-12-15 17:46:20 -05:00
Lain Soykaf
63d00f8123
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps
2022-12-15 17:19:36 -05:00
tusooa
62c27e0164
Fix failure when registering a user with no email when approval required
2022-12-14 01:04:42 -05:00
duponin
9876742358
Return 413 when an actor's banner or background exceeds the size limit
2022-12-11 23:15:08 +01:00
duponin
452595baed
Uploading an avatar media exceeding max size returns a 413
...
Until now it was returning a 500 because the upload plug were going
through the changeset and ending in the JSON encoder, which raised
because struct has to @derive the encoder.
2022-12-11 22:54:47 +01:00
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
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
c7a0df8006
Remove Quack from docs and cheatsheet
2022-11-18 10:09:52 -05:00
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
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
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
2186e9b62b
Tell newer Credo it's OK to exit 0 on single with clauses and piping into anonymous functions for now
2022-11-13 18:46:02 -05:00
e9c3be262c
Bump credo
...
Old credo is throwing errors on my Elixir 1.13 / OTP 25
2022-11-13 14:17:41 -05:00
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
47b9847edd
Deletes do not generate notifications of any kind, so skip trying
2022-11-13 12:25:52 -05:00
