Commit graph

17,355 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
79e59cb753 Merge branch 'status-push-notification' into 'develop'
Send push notifications for statuses from subscribed accounts

See merge request pleroma/pleroma!4396
2025-11-22 17:52:23 +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
09df007aef Merge branch 'plaroma' into 'develop'
i don't think it's called plaroma lol

See merge request pleroma/pleroma!4378
2025-11-01 11:25:57 +01:00
nicole mikołajczyk
724cdc44fc Fix typo in Pleroma name in docs 2025-11-01 11:25:55 +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
Mark Felder
d15f98bdec CI: Use the dotenv report method to capture the spec-build internal job id and pass it through to the spec-deploy job 2025-10-23 21:14:12 -07:00
Mark Felder
6f7e521488 CI: pass the variable CI_PIPELINE_ID through to the api-docs build job 2025-10-23 17:27:25 -07:00
Mark Felder
b6da3f490b Fix branch names for pleroma/docs and pleroma/api-docs triggers 2025-10-23 13:41:26 -07:00
feld
d54ec39448 Merge branch 'pipeline-fix' into 'develop'
CI: use triggers for docs and api-docs deployments

See merge request pleroma/pleroma!4388
2025-10-23 19:22:00 +00:00
Mark Felder
d09ec25454 CI: use triggers for docs and api-docs deployments
This is a "bridge job" which is more efficient. We do not need a token or API call then to make the CI run in the target repos.
2025-10-23 12:20:25 -07:00
feld
6026046b1c Merge branch 'expire-artifacts' into 'develop'
CI: Allow running pipelines from web or directly for a tag

See merge request pleroma/pleroma!4387
2025-10-23 18:46:25 +00:00
Mark Felder
a0225ddc79 CI: Allow running pipelines from web or directly for a tag 2025-10-23 11:44:11 -07:00
feld
6942244bb1 Merge branch 'expire-artifacts' into 'develop'
GitLab CI support for default artifacts setting is broken

See merge request pleroma/pleroma!4385
2025-10-23 18:34:39 +00:00
Mark Felder
a07305ca34 GitLab support for default artifacts setting is broken
https://gitlab.com/gitlab-org/gitlab/-/issues/404563
2025-10-23 11:34:11 -07:00
feld
3ab1c3ae8a Merge branch 'expire-artifacts' into 'develop'
Enable expiration of CICD job artifacts

See merge request pleroma/pleroma!4384
2025-10-22 20:41:49 +00:00
Mark Felder
4f31cadbcc Enable expiration of CICD job artifacts
We have accumulated nearly 200GB of old artifacts that we do not need.
2025-10-22 13:39:52 -07:00
nicole mikołajczyk
606c9ae4b1 Merge branch 'fix-lists-bcc' into 'develop'
Fix publisher when publishing to a list of users

See merge request pleroma/pleroma!4360
2025-10-21 21:56:26 +02: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
bb1e643996 Update changelog
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-10-15 11:01:18 +02:00
nicole mikołajczyk
d56433be69 List Mozhi in suggestions for translation providers
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-10-15 10:31:56 +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
0b8b98f979 Add a failing test
Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-10-10 05:36:46 +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
9eb923bd43 Merge branch 'docs' into 'develop'
Update *Differences in Mastodon API responses from vanilla Mastodon*

See merge request pleroma/pleroma!4369
2025-09-29 13:02:28 +02:00
nicole mikołajczyk
94188a293c Update *Differences in Mastodon API responses from vanilla Mastodon*
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2025-09-29 07:51:17 +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
mkljczk
aaaf18c1c5 Merge branch 'update-poll-voters-count' into 'develop'
Update voters count in remote polls when refreshing

See merge request pleroma/pleroma!4366
2025-09-27 12:49:46 +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
mkljczk
dccb264c42 Merge branch 'typo' into 'develop'
Fix typo in test name

See merge request pleroma/pleroma!4362
2025-09-19 17:34:36 +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
abdb511992 Fix typo in test name
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-09-07 22:41:25 +02: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
d1d7dd1827 Merge branch 'from/upstream-develop/tusooa/report-anon' into 'develop'
Anonymize reports

Closes #2661 and #1024

See merge request pleroma/pleroma!3806
2025-09-05 12:15:19 +00:00
Lain Soykaf
5503247b15 PublisherTest: Linting. 2025-09-05 15:17:17 +04: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
ae0c0260fd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-from/upstream-develop/tusooa/report-anon 2025-09-05 12:04:30 +04:00
Lain Soykaf
71785d7ff7 PublisherTest: Add test for signature replacement 2025-09-05 09:52:12 +04:00