summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-22Assign token to connectionMartin Kühl
2018-09-22Merge branch 'feature/html-scrub-policy-tests' into 'develop'kaniini
html: add scrub policy tests See merge request pleroma/pleroma!356
2018-09-22test: add smoketests for the scrubbing policiesWilliam Pitcock
2018-09-22html: twittertext: add missing catchall scrub functionWilliam Pitcock
2018-09-22Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'kaniini
twitter api: add no_rich_text option to userview for account prefs See merge request pleroma/pleroma!355
2018-09-22twitter api: add no_rich_text option to userview for account prefsWilliam Pitcock
2018-09-22Merge branch 'feature/rich-text-optout-backend' into 'develop'kaniini
backend support for opting out of rich text on a per-account basis See merge request pleroma/pleroma!354
2018-09-22test: add tests for new User.html_filter_policy()William Pitcock
2018-09-22mastodon api: formattingWilliam Pitcock
2018-09-22twitter api: add support for disabling rich textWilliam Pitcock
2018-09-22mastodon api: add support for user-supplied html policyWilliam Pitcock
2018-09-22twitter api: add support for user-specified html policyWilliam Pitcock
2018-09-22user: add User.html_filter_policy()William Pitcock
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
user: implement dynamic refresh of profiles See merge request pleroma/pleroma!350
2018-09-20Merge branch 'task-204-on-options-request' into 'develop'kaniini
Return 204 response on options request See merge request pleroma/pleroma!347
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 ↵William Pitcock
fix_ap_users task)
2018-09-20Merge branch 'bump-mastofe-2018-09-20' into 'develop'Haelwenn
Update mastodon frontend Closes https://git.pleroma.social/pleroma/mastofe/issues/33 See: https://git.pleroma.social/pleroma/pleroma/merge_requests/352
2018-09-20Update mastodon frontendHaelwenn (lanodan) Monnier
2018-09-20Merge branch 'feature/mastodon_api_2.5.0' into 'develop'Haelwenn
Update mastodon API to 2.5.0 Closes: https://git.pleroma.social/pleroma/pleroma/issues/298 Closes: https://git.pleroma.social/pleroma/pleroma/issues/299 See: https://git.pleroma.social/pleroma/pleroma/merge_requests/351
2018-09-20[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to ↵Haelwenn (lanodan) Monnier
2.5.0
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 ↵Haelwenn (lanodan) Monnier
value (false)
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 ↵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