summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-09-19twitter api: fix mimetype fallback when attachments use a URI instead of a UR...William Pitcock
2018-09-19mastodon api: default attachment type to image if one is not presentWilliam Pitcock
2018-09-19Merge branch 'fix/fake-filters' into 'develop'Haelwenn
2018-09-18Revert "Mastodon API: Fake support for loading filters"Martin Kühl
2018-09-17Return 204 response on options requestDominique Feyer
2018-09-16Merge branch 'feature/mediaproxy-inline-images' into 'develop'kaniini
2018-09-16config: pass inline images through mediaproxy (closes #275)William Pitcock
2018-09-16html: add policy which transforms inline images to pass through the media proxyWilliam Pitcock
2018-09-16html: allow scrubbing policies to be stackableWilliam Pitcock
2018-09-16Merge branch 'feature/mrf-scrub' into 'develop'kaniini
2018-09-16MRF: add policy for normalizing HTML markup (local and remote) to a specific ...William Pitcock
2018-09-16html: add the ability to override the default scrub policyWilliam Pitcock
2018-09-16Merge branch 'update-pleroma-frontend' into 'develop'kaniini
2018-09-16Merge branch 'feature/html-scrub-policy' into 'develop'kaniini
2018-09-14update-pleroma-frontendhakabahitoyo
2018-09-12Merge branch 'patch-3' into 'develop'Haelwenn
2018-09-10Update status_view_test.exsshadowfacts
2018-09-10Add visible_in_picker to status emojisshadowfacts
2018-09-10Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'kaniini
2018-09-10activitypub: transmogrifier: allow profile updates from botsWilliam Pitcock
2018-09-10Merge branch 'refactor/mrf-pattern-matching' into 'develop'kaniini
2018-09-10MRF: reject non-public: use pattern match to remove unnecessary if blockWilliam Pitcock
2018-09-10MRF: simple policy: refactor module to use guards and pattern matchingWilliam Pitcock
2018-09-10MRF: simple policy: contain media removal/nsfw ops to create activities onlyWilliam Pitcock
2018-09-10formattingWilliam Pitcock
2018-09-10html: allow inline images by default (because of custom emoji)William Pitcock
2018-09-10html: add default scrubbing profile and configuration knobsWilliam Pitcock
2018-09-10everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directlyWilliam Pitcock
2018-09-10html: new module providing a configurable markup scrubbing policyWilliam Pitcock
2018-09-09Merge branch 'bugfix/missing-url-encoding-oauth-token-redirect' into 'develop'kaniini
2018-09-09TASK: Fix formattingDominique Feyer
2018-09-09Add missing URL encoding in create authorization redirectDominique Feyer
2018-09-09Merge branch 'bugfix/test-circular-reference' into 'develop'kaniini
2018-09-09tests: break the cycle using pleroma.factoryWilliam Pitcock
2018-09-09tests: try breaking the cycle a different wayWilliam Pitcock
2018-09-09test: user enabled plug tests: fix circular referenceWilliam Pitcock
2018-09-09Merge branch 'update/pleroma-fe-20180909' into 'develop'kaniini
2018-09-09update pleroma frontendWilliam Pitcock
2018-09-09Merge branch 'suggestion-api-restriction' into 'develop'kaniini
2018-09-09make limit for /api/v1/suggestionsHakaba Hitoyo
2018-09-08Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'lambda
2018-09-07Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'kaniini
2018-09-07Merge branch 'improve-server-config-examples' into 'develop'kaniini
2018-09-07Merge branch 'feature/custom_media_url' into 'develop'kaniini
2018-09-07Merge branch 'fix/tusk' into 'develop'kaniini
2018-09-07Mastodon API: Fake support for loading filtersMartin Kühl
2018-09-07Mastodon API: Add unsupported attributes to relationship responsesMartin Kühl
2018-09-06Merge branch 'fix/test-failure-due-to/306' into 'develop'lambda
2018-09-05Fix warning.lain
2018-09-05Add LegacyAuthenticationPlug to router.lain