summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-14Fix `Activity.all_by_actor_and_id/2` testEgor Kislitsyn
2019-09-14Merge branch 'security/fav-reblog-access-control' into 'develop'rinpatch
Mastodon API: Respect post privacy in favourited/reblogged endpoints See merge request pleroma/pleroma!1667
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Mastodon API: Respect post privacy in favourited/reblogged endpointsrinpatch
2019-09-13Merge branch 'capture-test-errors' into 'develop'lain
Capture test error messages where appropriate See merge request pleroma/pleroma!1665
2019-09-13Merge branch 'refactor/add_link_headers' into 'develop'lain
Refactor `add_link_headers/7` -> `add_link_headers/3` See merge request pleroma/pleroma!1636
2019-09-13Merge branch 'develop' into feature/delivery-trackingrinpatch
2019-09-13Disallow NULLs in deliveriesrinpatch
2019-09-13Emoji: Generate emoji detecting functions at compile time.lain
Suggested by jvalim
2019-09-13don't track generated_config.mdAlex S
2019-09-13config.md backAlex S
2019-09-13markdown generation to the new fileAlex S
2019-09-13Capture test error messages where appropriatestwf
2019-09-13Separate Subscription Notifications from regular NotificationsRoman Chvanikov
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-13Apply suggestion to lib/pleroma/delivery.exrinpatch
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-13Merge branch 'cleanup-activity' into 'develop'lain
Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623
2019-09-13Linting.lain
2019-09-13Merge remote-tracking branch 'origin/develop' into reactionslain
2019-09-13Pleroma API Docs: Documented Emoji reaction endpoints.lain
2019-09-13ActivityPub: Use is_unicode_emoji? function.lain
2019-09-13Merge branch 'feature/change-email' into 'develop'Haelwenn
Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580
2019-09-13Merge branch 'admin-config-description' into 'develop'rinpatch
Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611
2019-09-13fix formattingMaksim Pechnikov
2019-09-13fix testsMaksim Pechnikov
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-13Remove unused functions and fix credo issuesrinpatch
2019-09-13Use delivery info when federating deletesrinpatch
2019-09-13Add a note about compatibility with MastodonEgor Kislitsyn
2019-09-13Add email change endpointEgor Kislitsyn
2019-09-13Add more tests for Pleroma.ActivityEgor Kislitsyn
2019-09-13Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.UtilsEgor Kislitsyn
2019-09-13fix Activity.get_by_idMaksim Pechnikov
2019-09-13Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsMaksim
2019-09-13Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-13Merge branch 'fix/admin-api-docs' into 'develop'kaniini
Fix admin api docs for creating users See merge request pleroma/pleroma!1660
2019-09-13Fix admin api docs for creating usersAngelina Filippova
2019-09-13Emoji: Add function to detect if a character is an emojilain
2019-09-12Merge branch 'fix/error-log-double-quotes' into 'develop'Haelwenn
Fix double quotes in error logs See merge request pleroma/pleroma!1656
2019-09-12Parse http signature for request to objects/activitiesrinpatch
2019-09-12Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-12Put the cache with the right key when using a tracking functionrinpatch
2019-09-12Track object/create activity fetchesrinpatch
2019-09-12Fix associated test as wellMark Felder
2019-09-12Transmogrifier: Strip internal emoji reaction fields.lain
2019-09-12PleromaAPIController: Add endpoint to fetch emoji reactions.lain
2019-09-12added test for OstatusMaksim Pechnikov