mint/pleroma
1
0
Fork 0
Code Releases Activity
14,692 Commits 1 Branch 0 Tags
3d1ede6900a5f1dbd57dbffce97ccb2e433c7e7a
Commit Graph

14692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FloatingGhost 3d1ede6900 fix emoji tests 2022-10-23 03:15:17 +03:00
FloatingGhost c6dc2cb15a fix quoting of custom emoji 
Fixes #3
 2022-10-23 03:04:18 +03:00
FloatingGhost 6c6a6854e8 Add capabilities for emoji reactions 
Patch from helene@p.helene.moe
 2022-10-23 03:01:20 +03:00
FloatingGhost fee5d58a33 add custom emoji reaction support 2022-10-23 03:00:28 +03:00
KiwiFarms 7866a8ffa9 Another frontend update 2022-10-23 02:08:32 +03:00
KiwiFarms 39a675ea06 Remove deprecated context_id accidentally pulled by quotepost merge 2022-10-23 00:59:32 +03:00
KiwiFarms 725a3ae77f Frontend update 2022-10-23 00:32:21 +03:00
KiwiFarms 08f3e59083 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-10-23 00:22:55 +03:00
KiwiFarms 30d537422b Merge branch 'quote-post' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-10-23 00:21:22 +03:00
Haelwenn 705ba6d615 Merge branch 'security/PleromaAPI-delete' into 'develop' 
CommonAPI: generate ModerationLog for all admin/moderator deletes

See merge request pleroma/pleroma!3765
 2022-10-15 12:54:20 +00:00
Haelwenn (lanodan) Monnier 16b06160ac CommonAPI: generate ModerationLog for all admin/moderator deletes 
As a side-effect it also changes the ChatMessage delete ID to an
Activity.id rather than MessageReference.id

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2958
 2022-10-14 18:51:08 +02:00
KiwiFarms 7e4d67431a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-10-12 11:29:03 +03:00
KiwiFarms 6313db3273 Prevent unauthorized users from forcefetching objects 2022-10-12 11:28:57 +03:00
tusooa c830282628 Merge branch 'weblate-extract' into 'develop' 
Extract translatable strings

See merge request pleroma/pleroma!3752
 2022-10-11 21:21:36 +00:00
weblate-extractor 1ac9bd0b4c Extract translatable strings 2022-10-11 06:13:00 +00:00
KiwiFarms 1856be25b7 Switch Linkify to my branch 2022-10-10 05:58:51 +03:00
KiwiFarms c13ce51ed9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-10-10 05:47:51 +03:00
tusooa 8042e0ebe1 Merge branch 'mergeback/2.4.4' into 'develop' 
mergeback: 2.4.4

See merge request pleroma/pleroma!3762
 2022-10-09 04:29:09 +00:00
Tusooa Zhu dd82fd234f Merge branch 'release/2.4.4' into mergeback/2.4.4 2022-10-08 22:15:09 -04:00
Haelwenn 3f1c31b7cd Merge branch 'fix/exclude-deactivated-in-search' into 'develop' 
User: search: exclude inactive users from user search

See merge request pleroma/pleroma!3755
 2022-09-27 23:58:45 +00:00
Haelwenn d43d02bf41 Merge branch 'from/upstream-develop/tusooa/fix-static-tests' into 'develop' 
Make instance document controller test sync

Closes #2940

See merge request pleroma/pleroma!3757
 2022-09-27 21:50:43 +00:00
Haelwenn 757a21554f Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop' 
Reduce incoming and outgoing federation queue sizes to 5

Closes #2169

See merge request pleroma/pleroma!3756
 2022-09-27 21:50:06 +00:00
Haelwenn 5d7d623390 Merge branch 'bugfix/elixir-1.14' into 'develop' 
Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
 2022-09-27 21:46:03 +00:00
Tusooa Zhu e66c02b775 Make instance document controller test sync 2022-09-20 12:34:10 -04:00
KiwiFarms 4c98955c0f Change protocol definition in janny message rewrite 2022-09-20 18:07:17 +03:00
KiwiFarms 1588b1f4c9 Frontend update 2022-09-20 17:18:56 +03:00
KiwiFarms cd14e34999 whoops 2022-09-20 17:18:45 +03:00
KiwiFarms 5d43b129ec Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-09-20 17:12:46 +03:00
KiwiFarms 705095e428 More rewrites for JannyLog MRF (possible fix?) 2022-09-20 17:12:40 +03:00
tusooa ac95b8b4f3 Merge branch 'websocketex' into 'develop' 
Use Websockex to replace websocket_client

See merge request pleroma/pleroma!3743
 2022-09-18 17:09:12 +00:00
Tusooa Zhu 467b6cad6f Reduce incoming and outgoing federation queue sizes to 5 2022-09-17 16:34:33 -04:00
tusooa 1a7107f4a5 Merge branch 'remove_from_followers' into 'develop' 
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers

See merge request pleroma/pleroma!3647
 2022-09-16 23:24:13 +00:00
a1batross 7f63b4c315 User: search: exclude deactivated users from user search 
This way we don't pollute search results with deactivated and deleted users
 2022-09-16 00:49:16 +03:00
Tusooa Zhu ea60c4e709 Fix wrong relationship direction 2022-09-14 20:24:04 -04:00
tusooa 90d4b7d604 Merge branch 'fix/user-factory-speed' into 'develop' 
tests/Factory: improve user generation performance

See merge request pleroma/pleroma!3754
 2022-09-12 00:53:14 +00:00
FloatingGhost 6bdf451ce8 Use set of pregenerated RSA keys 
Randomness is a huge resource sink, so let's just use
a some that we made earlier
 2022-09-11 21:33:20 +02:00
tusooa ac427de851 Merge branch 'fix/undo-boosts' into 'develop' 
ObjectView: do not fetch an object for its ID

See merge request pleroma/pleroma!3753
 2022-09-11 17:10:26 +00:00
Hélène 0b19625bfb ObjectView: do not fetch an object for its ID 
Non-Create/Listen activities had their associated object field
normalized and fetched, but only to use their `id` field, which is both
slow and redundant. This also failed on Undo activities, which delete
the associated object/activity in database.

Undo activities will now render properly and database loads should
improve ever so slightly.
 2022-09-11 04:54:04 +02:00
KiwiFarms d56bd9c70a Frontend update 2022-09-06 20:31:23 +03:00
KiwiFarms 7620f8aba7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-09-06 20:27:37 +03:00
Haelwenn 453a66f8c2 Merge branch 'weblate-extract' into 'develop' 
Extract translatable strings

See merge request pleroma/pleroma!3748
 2022-09-06 17:17:40 +00:00
weblate-extractor 3d32c92b37 Extract translatable strings 2022-09-06 16:45:08 +00:00
tusooa c0b265b404 Merge branch 'birthday-config-description' into 'develop' 
Clarify `birthday_min_age` config description

See merge request pleroma/pleroma!3747
 2022-09-06 12:40:02 +00:00
KiwiFarms b374dbdc0a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ryona-dev 2022-09-05 22:09:33 +03:00
marcin mikołajczak c6bc523914 Clarify birthday_min_age config description 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 20:25:01 +02:00
Haelwenn b8d6cb5845 Merge branch 'from/upstream-develop/tusooa/2892-backup-scope' into 'develop' 
Make backups require its own scope

Closes #2892

See merge request pleroma/pleroma!3721
 2022-09-05 15:42:02 +00:00
Haelwenn 346c130ddc Merge branch 'fix/user-private-key-generation' into 'develop' 
User: generate private keys on user creation

See merge request pleroma/pleroma!3737
 2022-09-05 15:38:15 +00:00
tusooa f7c2073103 Merge branch 'bump/min-elixir-1.10' into 'develop' 
Bump minimum Elixir version to 1.10

See merge request pleroma/pleroma!3741
 2022-09-05 15:19:34 +00:00
tusooa 9874b4c985 Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope' 
# Conflicts:
#   CHANGELOG.md
 2022-09-05 15:00:19 +00:00
Hélène cfb1bc967f Migrations: generate unset user keys 
User keys are now generated on user creation instead of "when needed",
to prevent race conditions in federation and a few other issues. This
migration will generate keys missing for local users.
 2022-09-05 03:51:35 +02:00