Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,780 Commits 1 Branch 0 Tags 222 MiB
5ce7db455c
Commit Graph

14780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d8e326467c Merge branch 'fix/2.4.5-release-date' into 'stable' 
Fix changelog date

See merge request pleroma/pleroma!3796
 2022-11-28 04:35:51 +00:00
Sean King
75c9f7770f
Fix changelog date 2022-11-27 20:17:48 -07: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
76bdb01c18 Merge branch 'release/2.4.5' into 'stable' 
Release 2.4.5

See merge request pleroma/pleroma!3793
 2022-11-27 21:24:19 +00:00
Haelwenn (lanodan) Monnier
f6d55e1e77 Mergeback of release 2.4.5 2022-11-27 13:20:42 +01:00
Haelwenn (lanodan) Monnier
2614f431b9 Release 2.4.5 2022-11-27 13:17:21 +01:00
Hélène
542bb17258 ArticleNotePageValidator: fix replies fixing 
Some software, like GoToSocial, expose replies as ActivityPub
Collections, but do not expose any item array directly in the object,
causing validation to fail via the ObjectID validator. Now, Pleroma will
drop that field in this situation too.
 2022-11-27 04:54:19 +01:00
FloatingGhost
747311f623 fix resolution of GTS user keys 2022-11-27 04:54:18 +01:00
Tusooa Zhu
11d5ad24c5 Make local-only posts stream in local timeline 2022-11-27 04:39:32 +01:00
Tusooa Zhu
e46c3a0595 Do not stream out Create of ChatMessage 2022-11-27 04:39:32 +01:00
Sean King
9b68778887 Fix fedi-fe build URL 2022-11-27 04:34:33 +01:00
Haelwenn (lanodan) Monnier
f2221d539c script_test: Fix %ErlangError for Elixir 1.14 2022-11-27 04:25:48 +01:00
Haelwenn (lanodan) Monnier
915c7319c6 mix: Switch prometheus_ex to fix/elixir-1.14 branch 2022-11-27 04:25:48 +01:00
Haelwenn (lanodan) Monnier
f12ddcd697 timeline_controller_test: Fix test name for elixir 1.14 2022-11-27 04:25:48 +01:00
Tusooa Zhu
09ab51eebb Make mutes and blocks behave the same as other lists 2022-11-27 04:21:58 +01:00
Haelwenn (lanodan) Monnier
7ec3469bea Transmogrifier: Use validating regex for "mediaType" 2022-11-27 04:21:31 +01:00
Haelwenn (lanodan) Monnier
8640d217b1 AttachmentValidator: Use custom ecto type and regex for "mediaType" 2022-11-27 04:21:31 +01:00
Haelwenn (lanodan) Monnier
da71092003 EctoType: Add MIME validator 2022-11-27 04:21:31 +01:00
Ilja
4504c81080 Delete report notifs when demoting from superuser 
When someone isn't a superuser any more, they shouldn't see the reporsts any more either.
Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
 2022-11-27 04:20:11 +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
508b438b53 scrubbers: Scrub img class attribute 
Closes: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3790
 2022-11-27 04:04:17 +01: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