Commit graph

10,249 commits

Author SHA1 Message Date
nicole mikołajczyk
e81e0d64c1 Merge branch 'endorsements-api' into 'develop'
Support new Mastodon API for endorsed accounts

See merge request pleroma/pleroma!4361
2025-11-28 14:51:06 +01:00
nicole mikołajczyk
ec51aadc78 Merge branch 'instance-view-timeline-access' into 'develop'
Add `timelines_access` to InstanceView

See merge request pleroma/pleroma!4393
2025-11-28 14:50:46 +01:00
nicole mikołajczyk
9548c31ef9 Merge branch 'translation-provider-mozhi' into 'develop'
Support Mozhi as translation provider

See merge request pleroma/pleroma!4376
2025-11-28 14:48:21 +01:00
nicole mikołajczyk
4fc1a62264 Merge branch 'notification-cleanup' into 'develop'
Minor cleanup and comment fixes

See merge request pleroma/pleroma!4397
2025-11-28 14:40:30 +01:00
nicole mikołajczyk
dc85b27990 Minor cleanup and comment fixes
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-25 13:52:50 +01:00
nicole mikołajczyk
9da1875c36 Send push notifications for statuses from subscribed accounts
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-22 16:51:21 +01:00
nicole mikołajczyk
b975dce9ba Add timelines_access to InstanceView
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-02 00:01:31 +01:00
nicole mikołajczyk
a893c69d20 Merge branch 'remote-url-fix' into 'develop'
Make `remote_url` link to unproxied URL

See merge request pleroma/pleroma!4365
2025-11-01 23:51:27 +01:00
nicole mikołajczyk
68b4de7558 Merge branch 'authorized-fetch-fix' into 'develop'
Fix fetching public keys with authorized fetch enabled

See merge request pleroma/pleroma!4383
2025-11-01 11:25:17 +01:00
nicole mikołajczyk
b6e16877e6 Merge branch 'local-nickname-regex-fix' into 'develop'
Use end-of-string in regex for local `get_by_nickname`

See merge request pleroma/pleroma!4358
2025-11-01 11:24:41 +01:00
nicole mikołajczyk
b38fedf342 Fix fetching public keys with authorized fetch enabled
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-10-21 21:46:03 +02:00
nicole mikołajczyk
1610d39f36 Revert "User.get_or_fetch_public_key_for_ap_id/1 is no longer required."
This reverts commit c0a50b7c3e.
2025-10-21 21:41:33 +02:00
nicole mikołajczyk
7e34d72860 Support Mozhi as translation provider
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-10-15 10:31:30 +02:00
nicole mikołajczyk
f989626bad Fix publisher when publishing to a list of users
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-10-10 05:37:01 +02:00
nicole mikołajczyk
5ce3c12c28 Merge branch 'develop' into 'endorsements-api'
# Conflicts:
#   test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
2025-10-08 05:04:55 +02:00
nicole mikołajczyk
8f9a139ba1 Merge branch 'notification-type-update' into 'develop'
Add `update` to @notification_types

See merge request pleroma/pleroma!4368
2025-09-27 14:35:09 +02:00
nicole mikołajczyk
e666ddc9ba Add update to @notification_types
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-09-27 12:40:26 +02:00
nicole mikołajczyk
a06d09ab15 Update voters count in remote polls when refreshing
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-09-27 10:50:51 +02:00
nicole mikołajczyk
546c03b2c6 remote_url links to unproxied URL
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-09-19 16:27:34 +02:00
feld
1efe48672d Merge branch 'ldap-wtf' into 'develop'
Remove redundant code from register_changeset_ldap

See merge request pleroma/pleroma!4412
2025-09-12 16:51:54 +00:00
nicole mikołajczyk
cb7086cb18 Use end-of-string in regex for local get_by_nickname
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-09-07 22:37:48 +02:00
Lain Soykaf
b023e1591c PublisherTest: Mock -> Mox 2025-09-05 15:04:33 +04:00
Lain Soykaf
3de250da23 PublisherTest: Use mox instead of mock. 2025-09-05 14:18:12 +04:00
Lain Soykaf
5bf1a384c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-from/upstream-develop/tusooa/report-anon 2025-09-04 18:10:41 +04:00
feld
14caaa8f23 Merge branch 'moderation-log-fix-3385' into 'develop'
Fix ModerationLog FunctionClauseError for unknown actions

Closes #3385

See merge request pleroma/pleroma!4384
2025-08-27 10:43:35 +00:00
lain
2980788c8e Merge branch 'admin-api-revocation' into 'develop'
Admin api revocation fix

Closes #3390

See merge request pleroma/pleroma!4382
2025-08-27 10:33:36 +00:00
lain
49376e6b75 Merge branch 'repost-repeat-filtering-3391' into 'develop'
Add only_reblogs parameter to account statuses API

Closes #3391

See merge request pleroma/pleroma!4385
2025-08-27 10:27:25 +00:00
Lain Soykaf
36b3aa0a97 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-pack-upload 2025-08-08 17:17:29 +04:00
Lain Soykaf
80e0f07240 Emoji.Pack: Implement empty name and directory creation failure handling 2025-08-08 15:44:30 +04:00
Lain Soykaf
f203e7bb42 EmojiPackController: Refactor. 2025-08-07 13:51:33 +04:00
Lain Soykaf
b249340fce Emoji.Pack: Refactor and use safe_unzip. 2025-08-07 13:51:19 +04:00
Ekaterina Vaartis
8d0b29d718 Only calculate SHA when there's no pack json 2025-08-07 11:22:51 +03:00
Ekaterina Vaartis
26ac875bc8 Use path_join_name_safe for pathname joining 2025-08-07 11:04:58 +03:00
Ekaterina Vaartis
321bd75dca Add a way to upload emoji pack from zip/url easily
Essentially the same as the mix task
2025-08-06 22:50:58 +03:00
Mark Felder
f53538b430 Merge remote-tracking branch 'origin/develop' into hashtag-search 2025-08-01 17:15:42 -07:00
feld
34efff85da Merge branch 'gun' into 'develop'
Update Plug/Cowboy/Gun

See merge request pleroma/pleroma!4393
2025-08-02 00:00:32 +00:00
feld
bb78fb5f65 Merge branch 'deactivated-404-inbox' into 'develop'
Return 404 when an activity is sent to a deactivated user's /inbox

Closes #3370

See merge request pleroma/pleroma!4371
2025-08-01 21:26:12 +00:00
Mark Felder
d67ab670b0 Fix Gopher server to use modern :ranch 2025-08-01 13:57:06 -07:00
feld
5f93e85e0b Merge branch 'tesla-update' into 'develop'
Update Tesla to 1.15.3

See merge request pleroma/pleroma!4391
2025-08-01 20:03:27 +00:00
Mark Felder
3c36bcfaa6 Remove deprecated "use Tesla" macro usage 2025-08-01 12:19:41 -07:00
Mark Felder
eac8ef7951 Credo 2025-08-01 10:41:53 -07:00
Lain Soykaf
bde52824d3 Fix ModerationLog FunctionClauseError for unknown actions
Add catchall clause to handle log entries with unknown actions or
malformed data. Prevents HTTP 500 errors in admin moderation log view.

Fixes #3385
2025-08-01 10:39:39 -07:00
Mark Felder
19f32f7b09 Strip hashtag prefixes
Users may actually type in a literal hashtag into the search, so this will ensure it still returns results.
2025-07-31 18:17:59 -07:00
Mark Felder
97e668f4aa Alpha sort the aliases 2025-07-31 18:07:05 -07:00
Mark Felder
b1acc9281a Use ranking to improve order of results 2025-07-31 18:02:33 -07:00
Mark Felder
93c144e397 Improve hashtag search with multi word queries 2025-07-31 17:46:32 -07:00
Mark Felder
26fe604942 Hashtag searches now return real results from the database 2025-07-31 17:35:11 -07:00
Mark Felder
425329bacd Add fix to ensure URL is encoded when reverse proxying 2025-07-30 17:32:08 -07:00
Mark Felder
49ba6c8865 Rework the URL encoding so it is a public function: Pleroma.HTTP.encode_url/1 2025-07-30 17:07:22 -07:00
Mark Felder
842090945a Ensure Hackney and Finch both get the default middleware 2025-07-30 15:42:49 -07:00