summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-09-22html: default to using normal scrub policy if provided scrub policy is nilWilliam Pitcock
2018-09-21Merge branch 'feature/dynamic-user-refresh' into 'develop'kaniini
2018-09-20Merge branch 'task-204-on-options-request' into 'develop'kaniini
2018-09-20mix: remove fix_ap_users task, now obsoleteWilliam Pitcock
2018-09-20test: add test proving that users are refreshed when staleWilliam Pitcock
2018-09-20user: implement dynamic refresh of profiles (gets rid of need for fix_ap_user...William Pitcock
2018-09-20Merge branch 'bump-mastofe-2018-09-20' into 'develop'Haelwenn
2018-09-20Update mastodon frontendHaelwenn (lanodan) Monnier
2018-09-20Merge branch 'feature/mastodon_api_2.5.0' into 'develop'Haelwenn
2018-09-20[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2...Haelwenn (lanodan) Monnier
2018-09-20[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variablesHaelwenn (lanodan) Monnier
2018-09-20[Pleroma.Web.Router]: Fake /api/v1/endorsementsHaelwenn (lanodan) Monnier
2018-09-20[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value...Haelwenn (lanodan) Monnier
2018-09-20[Pleroma.Web.MastodonAPI.StatusView] add replies_countHaelwenn (lanodan) Monnier
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