Commit graph

8879 commits

Author SHA1 Message Date
af715bbf70
Revert Static FE 2022-12-27 15:22:45 +01:00
b8a7e65ba1
Merge branch 'develop' of ssh://git.pleroma.social:2222/pleroma/pleroma into froth 2022-12-18 13:39:06 +01:00
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 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
e67e72de1b
Merge develop again, again :) 2022-11-28 18:39:15 +01:00
ave
0f88c2bca4 Change follow_operation schema to use type BooleanLike 2022-11-28 00:13:34 +00:00
927ecd3e66
I HATE MERGE COMMITS I HATE MERGE COMMITS 2022-11-22 23:09:24 +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
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
Sol Fisher Romanoff
f5f44bdab9
Add support for internationalization 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
b6ede6ced1
Fix error pages 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
4e463b0a8a
Add followers/following tabs 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
efcab4f6d4
Add favicon 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
80fb9efc5a
Add with_replies and media tabs 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
0faf544ebb
Add reply to and edited at headers 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
037baa6e58
Add nsfw banner to attachments 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
3289b410b3
tabs => spaces 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
35613d9c86
Add fontawesome icons 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
aabe72f41e
Make attachments fit into statuses 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
dc634b5201
Overhaul conversation and status 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
0ee31347e4
Add newer and older posts buttons 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
44b61eb776
Make navbar and background scroll-friendly 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
6a99c55435
Add admin/mod/bot indicators 2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
16ddd5a9c9
Overhaul profile page
todo: posts/with replies/attachments switch
2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
581a54e67f
Add navbar, sidebar and background to static-fe 2022-11-18 22:55:35 +01: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
cecdecf083
Merge branch 'develop' of upstream into froth 2022-11-15 15:59:29 +01: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
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
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
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