summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-19twitter api: fix mimetype fallback when attachments use a URI instead of a ↵William Pitcock
URL object
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
Revert "Mastodon API: Fake support for loading filters" See merge request pleroma/pleroma!348
2018-09-18Revert "Mastodon API: Fake support for loading filters"Martin Kühl
This reverts commit c1d07da4e18cc2acd11a5a131e1482aec5996552. The fake support was superseded by 6e030129fb33926e6a5bd75c27af6f657f9da2a5 which actually implements the faked filters API. This change removes the fake support and ensures that the actual implementation is used.
2018-09-17Return 204 response on options requestDominique Feyer
2018-09-16Merge branch 'feature/mediaproxy-inline-images' into 'develop'kaniini
html: support mediaproxy for inline images Closes #275 See merge request pleroma/pleroma!346
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
MRF: html scrubbing filter See merge request pleroma/pleroma!345
2018-09-16MRF: add policy for normalizing HTML markup (local and remote) to a specific ↵William Pitcock
policy
2018-09-16html: add the ability to override the default scrub policyWilliam Pitcock
2018-09-16Merge branch 'update-pleroma-frontend' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!344
2018-09-16Merge branch 'feature/html-scrub-policy' into 'develop'kaniini
html scrub policy See merge request pleroma/pleroma!339
2018-09-14update-pleroma-frontendhakabahitoyo
2018-09-12Merge branch 'patch-3' into 'develop'Haelwenn
Add visible_in_picker to status emojis See merge request pleroma/pleroma!342
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
activitypub: transmogrifier: allow profile updates from bots See merge request pleroma/pleroma!341
2018-09-10activitypub: transmogrifier: allow profile updates from botsWilliam Pitcock
2018-09-10Merge branch 'refactor/mrf-pattern-matching' into 'develop'kaniini
MRF: significant refactoring See merge request pleroma/pleroma!340
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
Add missing URL encoding in create authorization redirect See merge request pleroma/pleroma!338
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
test: user enabled plug tests: fix circular reference See merge request pleroma/pleroma!336
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
update pleroma frontend See merge request pleroma/pleroma!335
2018-09-09update pleroma frontendWilliam Pitcock
2018-09-09Merge branch 'suggestion-api-restriction' into 'develop'kaniini
Make limit for /api/v1/suggestions See merge request pleroma/pleroma!334
2018-09-09make limit for /api/v1/suggestionsHakaba Hitoyo
2018-09-08Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'lambda
auth overhaul and legacy GS auth See merge request pleroma/pleroma!331
2018-09-07Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'kaniini
Add Secure and SameSite cookie flags See merge request pleroma/pleroma!302
2018-09-07Merge branch 'improve-server-config-examples' into 'develop'kaniini
Improve server config examples See merge request pleroma/pleroma!307
2018-09-07Merge branch 'feature/custom_media_url' into 'develop'kaniini
[Pleroma.Uploaders.Local]: Add configuration for custom url path See merge request pleroma/pleroma!318
2018-09-07Merge branch 'fix/tusk' into 'develop'kaniini
Fix signin and initial loading with Tusk See merge request pleroma/pleroma!333
2018-09-07Mastodon API: Fake support for loading filtersMartin Kühl
2018-09-07Mastodon API: Add unsupported attributes to relationship responsesMartin Kühl
These attributes are documented as required by the Mastodon API. Since we don’t support them (I think?), respond with default values.
2018-09-06Merge branch 'fix/test-failure-due-to/306' into 'develop'lambda
Fix the tests See merge request pleroma/pleroma!332
2018-09-05Fix warning.lain
2018-09-05Add LegacyAuthenticationPlug to router.lain