1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2025-12-09 05:20:38 +00:00
Commit graph

17392 commits

Author SHA1 Message Date
HJ
cc14a7e33b Merge branch 'hj-develop-patch-37634' into 'develop'
Allow FediIndex

See merge request pleroma/pleroma!4391
2025-12-08 18:28:55 +00:00
nicole mikołajczyk
40695530a6 Merge branch 'changelog/fix-checker' into 'develop'
changelog-checker: Change changelog entry type

See merge request pleroma/pleroma!4402
2025-12-02 19:36:51 +01:00
nicole mikołajczyk
df1a3b5a70 changelog-checker: Change changelog entry type 2025-12-02 19:36:50 +01:00
nicole mikołajczyk
90686f96d6 Merge branch 'changelog/fix-checker' into 'develop'
Fix changelog checker

See merge request pleroma/pleroma!4395
2025-12-02 19:35:19 +01:00
nicole mikołajczyk
d7b0115124 Merge branch 'mastodon-quotes-updates' into 'develop'
Use Mastodon-compatible route for quotes list and param for quotes count

See merge request pleroma/pleroma!4367
2025-12-02 14:34:16 +01:00
nicole mikołajczyk
ca03d94f52 Merge branch 'pin-chats' into 'develop'
Chats: pin/unpin chats

See merge request pleroma/pleroma!3637
2025-11-29 18:45:42 +01:00
nicole mikołajczyk
6b8bc3bb4c Merge branch 'blocked-muted-swagger' into 'develop'
Use separate schemas for muted/blocked accounts lists

See merge request pleroma/pleroma!4359
2025-11-29 18:45:33 +01:00
nicole mikołajczyk
f443b6d1d7 Merge branch 'lookup-restrict-unauthenticated' into 'develop'
Respect restrict_unauthenticated in /api/v1/accounts/lookup

See merge request pleroma/pleroma!4355
2025-11-29 18:13:53 +01:00
nicole mikołajczyk
2330c50666 Merge branch 'inlinequotes-mastodon' into 'develop'
MRF InlineQuotePolicy: Don't inline quoted post URL in Mastodon quotes

See merge request pleroma/pleroma!4371
2025-11-29 18:12:33 +01:00
Phantasm
5cb141a54e MRF InlineQuotePolicy: Don't inline quoted post URL in Mastodon quotes 2025-11-29 18:12:32 +01:00
nicole mikołajczyk
e74b6ed348 Merge branch 'scrubber-inline-quotes-mastodon' into 'develop'
Scrubber: Allow `quote-inline` class in <p> tags used by Mastodon quotes

See merge request pleroma/pleroma!4373
2025-11-29 17:27:01 +01:00
nicole mikołajczyk
26a058935a Merge branch 'filter-user-capabilities' into 'develop'
Allow filtering users with `accepts_chat_messages` capability

See merge request pleroma/pleroma!4372
2025-11-29 17:26:01 +01:00
nicole mikołajczyk
6e98c7a1ca Merge branch 'rich-media-user-agent' into 'develop'
Allow setting custom user-agent for fetching rich media content

See merge request pleroma/pleroma!4390
2025-11-29 17:25:18 +01:00
nicole mikołajczyk
428e038c58 Merge branch 'notification-view-deduplicate' into 'develop'
remove duplicated code from notificationview

See merge request pleroma/pleroma!4356
2025-11-29 17:21:44 +01:00
Atsuko Karagi
ef41378fa2 Respect restrict_unauthenticated in /api/v1/accounts/lookup
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-29 17:18:38 +01:00
nicole mikołajczyk
be0146afb3 Improve example
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-29 17:10:24 +01:00
nicole mikołajczyk
d2f6cc1445 Use separate schemas for muted/blocked accounts lists
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-29 17:10:24 +01:00
nicole mikołajczyk
f61fad0663 Pin/unpin chats
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-29 16:53:56 +01:00
nicole mikołajczyk
0dfcc24d30 Merge branch 'translation-provider-translatelocally' into 'develop'
Support translateLocally translation provider

See merge request pleroma/pleroma!4377
2025-11-29 16:50:42 +01:00
nicole mikołajczyk
ba8b5682cc Merge branch 'stream-marker-updates' into 'develop'
Stream marker updates

See merge request pleroma/pleroma!4354
2025-11-29 16:49:29 +01:00
nicole mikołajczyk
367d5c65f6 Merge branch 'outgoing_follow_requests' into 'develop'
Add /api/v1/pleroma/outgoing_follow_requests

See merge request pleroma/pleroma!4310
2025-11-28 16:36:40 +01:00
nicole mikołajczyk
13bc4ba639 Merge remote-tracking branch 'origin/develop' into translation-provider-translatelocally
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-28 15:07:43 +01:00
mkljczk
e458bd953a Add /api/v1/pleroma/outgoing_follow_requests
Signed-off-by: mkljczk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-28 14:59:55 +01:00
nicole mikołajczyk
5f4c948057 fix typo
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-11-28 14:53:22 +01:00
nicole mikołajczyk
0476cf4283 Merge branch 'rss-redirect' into 'develop'
Redirect /users/:nickname.rss to /users/:nickname/feed.rss instead of .atom

See merge request pleroma/pleroma!4375
2025-11-28 14:51:11 +01:00
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
Mint
aef26a615e Fix changelog checker 2025-11-07 19:47:54 +03: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
HJ
a275ffacaf changelog 2025-10-29 16:49:37 +00:00
HJ
ca098a2bea Allow FediIndex 2025-10-29 16:47:59 +00:00
nicole mikołajczyk
32a940b86b Allow setting custom user-agent for fetching rich media content
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-10-26 23:32:54 +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