aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-28Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'kaniini
activitypub: don't fall back to OStatus fetching when MRF rejects an object See merge request pleroma/pleroma!362
2018-09-28activitypub: don't fall back to OStatus fetching when MRF rejects an objectWilliam Pitcock
2018-09-28Merge branch 'security/ap-unsigned-create' into 'develop'kaniini
activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else See merge request pleroma/pleroma!361
2018-09-28activitypub inbox: only accept unsigned/invalid-signature relayed creates, ↵William Pitcock
nothing else although the previous handling assumed any unsigned/invalid signature message was a Create, lets make it more explicit
2018-09-27Merge branch 'bugfix/kroeg' into 'develop'kaniini
More kroeg bugfixes See merge request pleroma/pleroma!353
2018-09-27transmogrifier: get_actor called without casting attributedTo in actor and ↵Haelwenn (lanodan) Monnier
actor is nil
2018-09-27transmogrifier: Just make attachement maps into a list and rerollHaelwenn (lanodan) Monnier
2018-09-27transmogrifier: Use the correct variable and prefer inspect in case of a bad ↵Haelwenn (lanodan) Monnier
type being passed on
2018-09-27transmogrifier: more robustly handle dereferencing pointer URIsWilliam Pitcock
2018-09-27transmogrifier: Use oneliners when applicableHaelwenn (lanodan) Monnier
2018-09-27transmogrifier: reformat `cond` block by handWilliam Pitcock
2018-09-27transmogrifier: Add support for array-less hashtags, add broken announce, ↵Haelwenn (lanodan) Monnier
harden get_actor
2018-09-27transmogrifier: pro-actively add support for Hashtag without array in tagHaelwenn (lanodan) Monnier
2018-09-27transmogrifier_test: incoming notices with tag not being an array (kroeg)Haelwenn (lanodan) Monnier
2018-09-27transmogrifier: Use a cond, add proactive support for arraysHaelwenn (lanodan) Monnier
2018-09-27[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a MapHaelwenn (lanodan) Monnier
2018-09-27[Pleroma.Web.ActivityPub.Transmogrifier]: fix emoji in tag when it’s not ↵Haelwenn (lanodan) Monnier
in a array [kroeg] Also simplified the code for name trimming. And not copying the Map.merge part as it looks buggy. See: https://queer.hacktivis.me/objects/a9f21ebc-9a12-4a6c-89d5-3d46955c6ee8
2018-09-27[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is ↵Haelwenn (lanodan) Monnier
just a Map [kroeg]
2018-09-27[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined ↵Haelwenn (lanodan) Monnier
post [kroeg]
2018-09-27[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]Haelwenn (lanodan) Monnier
2018-09-24Merge branch 'fix/s3/filenames-with-spaces' into 'develop'kaniini
Uploaders.S3: Replace unsafe characters in object key See merge request pleroma/pleroma!359
2018-09-24Uploaders.S3: Replace unsafe characters in object keyMartin Kühl
According to [the S3 docs][s3], the characters safe for use in object keys are: * 0-9 * a-z * A-Z * ! * - * _ * . * * * ' * ( * ) (The / character is not listed but mentioned being safe outside of the list.) Several characters that are valid in filenames can cause problems, for example spaces are not valid in URLs and need to be escaped, sequences of spaces can become squeezed by S3, some characters like \ are documented to require “significant special handling”. To avoid these problems, this change encodes the filename before using it as part of the S3 object name by replacing all characters except those documented as “safe” with dashes. [s3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html
2018-09-22Merge branch 'update/pleroma-fe-20180922' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!357
2018-09-22update pleroma frontendWilliam Pitcock
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