hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17,321 commits 1 branch 0 tags 241 MiB
Commit graph

10,233 commits

Author SHA1 Message Date
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
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
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
Mark Felder
404e091260 Credo 2025-07-30 13:48:16 -07:00
Mark Felder
4217ababfc Improve design so existing tests do not break 2025-07-30 13:17:50 -07:00
Mark Felder
11d27349e3 Fix HTTP client making invalid requests due to no percent encoding processing or validation. 2025-07-30 12:29:37 -07:00
feld
ece089abab Merge branch 'improved-reachability' into 'develop' 
Reachability refactor

See merge request pleroma/pleroma!4366
 2025-07-29 21:13:48 +00:00
Lain Soykaf
331f21111c Add only_reblogs parameter to account statuses API 
Implement filtering to show only reblogs/reposts in user status queries.
This complements the existing exclude_reblogs parameter. Supports both
boolean and "1" string values for consistency with other API parameters.
 2025-07-23 13:30:25 +04:00
Mark Felder
6da5ca9b2d Prevent test crash if it cannot successfully remove the console Logger backend 2025-07-22 15:21:20 -07:00
Mark Felder
28cff592b1 Fix dialyzer error in MRF remote report policy: Remove unreachable pattern match 2025-07-22 15:21:20 -07:00
Mark Felder
28146ee7d2 Fix dialyzer error in safe_zip: Remove impossible pattern match for {:get_type, _e} 2025-07-22 15:21:20 -07:00
Mark Felder
e0104132a7 Fix dialyzer error in object fetcher: Add proper guard clause for check_crossdomain_redirect/2 
Also remove unnecessary and incorrect usage of Mix.env()
 2025-07-22 15:21:20 -07:00
Mark Felder
1d4482047f Fix dialyzer error in translation provider: Change Map.t() to map() in callback spec 2025-07-22 15:21:20 -07:00
Mark Felder
47ebbc4d21 Fix dialyzer error in status controller: Add catch-all pattern for translate function 2025-07-22 12:38:43 -07:00
Mark Felder
daad35aeb9 Fix dialyzer error in scopes compiler: Add error handling for extract_all_scopes/0 2025-07-22 12:38:43 -07:00
Mark Felder
9ea55a3888 Fix dialyzer error in API spec: Use then/2 for OpenApiSpex.resolve_schema_modules/1 call 2025-07-22 12:38:43 -07:00
Lain Soykaf
c38ce20a5d AdminApiController: Reorder functions to fix admin revocation 2025-07-20 21:33:39 +04:00
mkljczk
b082e1f86b Merge branch 'endorsement-state-fix' into 'develop' 
Fix endorsement state display in relationship view

See merge request pleroma/pleroma!4381
 2025-07-09 00:05:21 +02:00
nicole mikołajczyk
f031532c41 Fix endorsement state display in relationship view 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2025-07-08 23:13:40 +02:00