Sam Therapy
e67e72de1b
Merge develop again, again :)
2022-11-28 18:39:15 +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
Sam Therapy
1f1b72a11f
fix some XSS maybe
...
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-11-26 18:35:27 +01:00
Sam Therapy
7ad1637a7a
Update Admin-FE
2022-11-22 23:53:01 +01:00
Sam Therapy
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
Sol Fisher Romanoff
064be8fe71
Fix css for mobile devices
2022-11-18 22:55:35 +01:00
Sol Fisher Romanoff
9e010a2bc2
Organize CSS and add light theme
2022-11-18 22:55:35 +01: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
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
Sam Therapy
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
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
Sam Therapy
