aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-11Do not fetch the reply object in `fix_type` unless the object has therinpatch
`name` key and use a depth limit when fetching it
2019-08-10Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'kaniini
MRF: ensure that subdomain_match calls are case-insensitive See merge request pleroma/pleroma!1550
2019-08-10MRF: ensure that subdomain_match calls are case-insensitiveAriadne Conill
2019-08-10Merge branch 'fix/hide-follows-counters' into 'develop'kaniini
Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled See merge request pleroma/pleroma!1544
2019-08-10Merge branch 'develop' into 'fix/hide-follows-counters'kaniini
# Conflicts: # CHANGELOG.md
2019-08-10Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'kaniini
Strip internal fields including likes from incoming and outgoing activities Closes #1159 See merge request pleroma/pleroma!1533
2019-08-10Strip internal fields including likes from incoming and outgoing activitiesSergey Suprunenko
2019-08-10Merge branch 'test/pleroma_uploaders' into 'develop'kaniini
tests for Pleroma.Uploaders See merge request pleroma/pleroma!1543
2019-08-10tests for Pleroma.UploadersMaksim
2019-08-10Merge branch 'fix/mastoapi-threadmute-detection' into 'develop'kaniini
Mastodon API: Fix thread mute detection See merge request pleroma/pleroma!1548
2019-08-10Mastodon API: Fix thread mute detectionrinpatch
It was calling CommonAPI.thread_muted? with post author's account instead of viewer's one.
2019-08-10Merge branch 'feature/uploader_s3' into 'develop'rinpatch
Uploader.S3 added support stream uploads See merge request pleroma/pleroma!1545
2019-08-10Uploader.S3 added support stream uploadsMaksim
2019-08-09Fix deactivated user deletionMaxim Filippov
2019-08-09Mastodon API: Set follower/following counters to 0 when hidingrinpatch
followers/following is enabled We are already doing that in AP representation, so I think we should do it here as well for consistency.
2019-08-08Merge branch 'feature/digest-email' into 'develop'lain
Feature/digest email See merge request pleroma/pleroma!1078
2019-08-08Merge remote-tracking branch 'origin/develop' into pleroma-conversationslain
2019-08-07Merge branch 'patch-3' into 'develop'rinpatch
Return profile URL when available instead of actor URI for MastodonAPI mention URL Closes #1165 See merge request pleroma/pleroma!1541
2019-08-07Return profile URL in MastodonAPI's `url` fieldThibaut Girka
2019-08-07Simplify logic to mention.js `url` fieldThibaut Girka
`User.profile_url` already fallbacks to ap_id
2019-08-07Return profile URL when available instead of actor URI for MastodonAPI ↵Thibaut Girka
mention URL Fixes #1165
2019-08-06Merge branch 'fix/object-reembeds' into 'develop'Haelwenn
Do not rembed the object after updating it Closes #1142 See merge request pleroma/pleroma!1538
2019-08-07Do not rembed the object after updating itrinpatch
2019-08-07OStatus tests: stop relying on embedded objectsrinpatch
2019-08-07ActivityPub tests: remove assertions of embedded object being updated,rinpatch
because the objects are no longer supposed to be embedded
2019-08-07OStatus Announce Representer: Do not depend on the object being embeddedrinpatch
in the Create activity
2019-08-07Stop depending on the embedded object in restrict_favorited_byrinpatch
2019-08-06Merge branch 'issue/1150' into 'develop'kaniini
[#1150] fixed parser TwitterCard See merge request pleroma/pleroma!1537
2019-08-06[#1150] fixed parser TwitterCardMaksim
2019-08-06Conversation: Rename function to better express what it does.lain
2019-08-06Participation: Setting recipients will always add the owner.lain
2019-08-05Merge branch 'test/common_api_utils.ex' into 'develop'kaniini
tests for CommonApi/Utils See merge request pleroma/pleroma!1534
2019-08-05tests for CommonApi/UtilsMaksim
2019-08-05Linting.lain
2019-08-05Pleroma Conversations: Document differences.lain
2019-08-05CommonAPI: Replies to conversations also get the correct context id.lain
2019-08-05Pleroma Conversations API: Add a way to set recipients.lain
2019-08-05Update CHANGELOGEgor Kislitsyn
2019-08-04Merge branch 'report-email-from-remote-user' into 'develop'kaniini
Remove Reply-To from report emails Closes #1141 See merge request pleroma/pleroma!1531
2019-08-04Remove Reply-To from report emailsEugenij
2019-08-04Merge branch 'feature/relay-list-task' into 'develop'kaniini
tasks: relay: add list task Closes #1101 See merge request pleroma/pleroma!1528
2019-08-04Merge branch 'fix/wrong-next-key-likes-json' into 'develop'kaniini
Do not add the "next" key to likes.json if there is no more items See merge request pleroma/pleroma!1530
2019-08-04Do not add the "next" key to likes.json if there is no more itemsSergey Suprunenko
2019-08-04Merge branch 'patch-2' into 'develop'kaniini
Replace "impode" with "implode" See merge request pleroma/pleroma!1532
2019-08-04Replace "impode" with "implode" forx0rz3q
2019-08-04Merge branch 'remove-longfox-emoji-set' into 'develop'kaniini
Remove longfox emoji set See merge request pleroma/pleroma!1525
2019-08-04Remove longfox emoji setHakaba Hitoyo
2019-08-04Merge branch 'develop' into 'develop'kaniini
Fix a stale link and a few typos See merge request pleroma/pleroma!1529
2019-08-04Fix some typos and rework a few lines in howto_mediaproxy.mdPierce McGoran
2019-08-04Update link in README.mdPierce McGoran
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:13:03 +0000