aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-08-10Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'kaniini
2019-08-10Strip internal fields including likes from incoming and outgoing activitiesSergey Suprunenko
2019-08-10Merge branch 'test/pleroma_uploaders' into 'develop'kaniini
2019-08-10tests for Pleroma.UploadersMaksim
2019-08-10Merge branch 'fix/mastoapi-threadmute-detection' into 'develop'kaniini
2019-08-10Mastodon API: Fix thread mute detectionrinpatch
2019-08-10Merge branch 'feature/uploader_s3' into 'develop'rinpatch
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
2019-08-08Merge branch 'feature/digest-email' into 'develop'lain
2019-08-08Merge remote-tracking branch 'origin/develop' into pleroma-conversationslain
2019-08-07Merge branch 'patch-3' into 'develop'rinpatch
2019-08-07Return profile URL in MastodonAPI's `url` fieldThibaut Girka
2019-08-07Simplify logic to mention.js `url` fieldThibaut Girka
2019-08-07Return profile URL when available instead of actor URI for MastodonAPI mentio...Thibaut Girka
2019-08-06Merge branch 'fix/object-reembeds' into 'develop'Haelwenn
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
2019-08-07OStatus Announce Representer: Do not depend on the object being embeddedrinpatch
2019-08-07Stop depending on the embedded object in restrict_favorited_byrinpatch
2019-08-06Merge branch 'issue/1150' into 'develop'kaniini
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
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
2019-08-04Remove Reply-To from report emailsEugenij
2019-08-04Merge branch 'feature/relay-list-task' into 'develop'kaniini
2019-08-04Merge branch 'fix/wrong-next-key-likes-json' into 'develop'kaniini
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
2019-08-04Replace "impode" with "implode" forx0rz3q
2019-08-04Merge branch 'remove-longfox-emoji-set' into 'develop'kaniini
2019-08-04Remove longfox emoji setHakaba Hitoyo
2019-08-04Merge branch 'develop' into 'develop'kaniini
2019-08-04Fix some typos and rework a few lines in howto_mediaproxy.mdPierce McGoran
2019-08-04Update link in README.mdPierce McGoran
2019-08-03tasks: relay: add list taskAriadne Conill
2019-08-03Merge branch 'bugfix/password-reset-link-styling' into 'develop'kaniini
2019-08-03templates/layout/app.html.eex: Style anchorsHaelwenn (lanodan) Monnier
2019-08-03Merge branch 'patch-2' into 'develop'kaniini
2019-08-03RefactorThibaut Girka