aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-08-13Merge branch 'test/web_activity_pub_relay' into 'develop'kaniini
2019-08-13tests for Web/ActivityPub/RelayMaksim
2019-08-13Merge branch 'test/web_mastodon_api' into 'develop'kaniini
2019-08-13tests for /web/mastodon_api/mastodon_api.exMaksim
2019-08-13update changelog for mrf_vocabularyAriadne Conill
2019-08-13tests: add tests for mrf_vocabularyAriadne Conill
2019-08-13docs: document mrf_vocabulary module settingsAriadne Conill
2019-08-13MRF: add vocabulary policy moduleAriadne Conill
2019-08-13Mastodon API: Preloading and normalization optimizationsrinpatch
2019-08-13Merge branch 'feature/remove-disable-blocks' into 'develop'kaniini
2019-08-13config: remove legacy activitypub accept_blocks settingAriadne Conill
2019-08-12Merge branch 'update/admin-fe' into 'develop'rinpatch
2019-08-12Update AdminFEMark Felder
2019-08-12Modify Changelog.lain
2019-08-12ConversationView: Align parameter names with other views.lain
2019-08-12Conversation: Add endpoint to get a conversation by id.lain
2019-08-12Conversations: Use 'recipients' for accounts in conversation view.lain
2019-08-11Merge branch 'chore/changelog-update' into 'develop'rinpatch
2019-08-11Add a changelog entry for !1552rinpatch
2019-08-11Merge branch 'fix/fix-type-depth' into 'develop'rinpatch
2019-08-11Do not fetch the reply object in `fix_type` unless the object has therinpatch
2019-08-10Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'kaniini
2019-08-10MRF: ensure that subdomain_match calls are case-insensitiveAriadne Conill
2019-08-10Merge branch 'fix/hide-follows-counters' into 'develop'kaniini
2019-08-10Merge branch 'develop' into 'fix/hide-follows-counters'kaniini
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-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