aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-09-15added prepare html for RichMedia.ParserMaksim Pechnikov
2019-09-15Merge branch 'develop' into support/testsMaksim Pechnikov
2019-09-15[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md
2019-09-14Merge branch 'config-changes' into 'develop'rinpatch
two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666
2019-09-14Merge branch 'fix/truncate-remote-user-fields' into 'develop'rinpatch
Truncate remote user fields See merge request pleroma/pleroma!1619
2019-09-14Merge branch 'develop' into refactor/subscriptionRoman Chvanikov
2019-09-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
2019-09-14Mastodon API: Respect post privacy in favourited/reblogged endpointsrinpatch
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-13markdown generation to the new fileAlex S
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-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-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 email change endpointEgor Kislitsyn
2019-09-13Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.UtilsEgor Kislitsyn
2019-09-13fix Activity.get_by_idMaksim Pechnikov
2019-09-13Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
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-12Transmogrifier: Strip internal emoji reaction fields.lain
2019-09-12PleromaAPIController: Add endpoint to fetch emoji reactions.lain
2019-09-12added test for OstatusMaksim Pechnikov
2019-09-11Fix double quotes in error logsMark Felder
Example: pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca"", error: nil
2019-09-11added testsMaksim Pechnikov
2019-09-11Use Jason for rendering responsesrinpatch
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](https://github.com/phoenixframework/phoenix/blob/3bfb9f6e900c9a2e31cb95736e2cb5bdad329b61/lib/phoenix.ex#L58-L59)
2019-09-11Merge branch 'patch-5' into 'develop'Haelwenn
Mastodon API: URI encode hashtag name in generated URLs See merge request pleroma/pleroma!1642
2019-09-11Merge branch 'fix/oom-parallel-rendering' into 'develop'lain
Revert "Parallelize template rendering" See merge request pleroma/pleroma!1654
2019-09-11Add extended benchmarkrinpatch
2019-09-11refactoringAlex S
2019-09-11little refactorAlex S
2019-09-11some changesAlex S
2019-09-11little fixAlex S