summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2018-09-05Update legacy passwords automatically.lain
2018-09-05Fix the testsMartin Kühl
2018-09-05Update Mix.locklain
2018-09-05Add Plugs to router.lain
2018-09-05Add UserEnabledPlug.lain
2018-09-05Add SetUserSessionIdPlug.lain
2018-09-05Merge branch 'fix/sign-in-with-toot' into 'develop'Haelwenn
Fix sign-in and sign-out with Toot! See merge request pleroma/pleroma!306
2018-09-05Add new plugs to router.lain
2018-09-05Add EnsureUserKeyPlug, smaller fixeslain
2018-09-05Simplify AuthenticationPluglain
2018-09-05Add SessionAuthenticationPlug.lain