summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-05user: add wait_and_refresh() for async three-way handshake caseWilliam Pitcock
2018-10-05mastodon api: account view: fetch follow state and use it to populate ↵William Pitcock
`requested` field
2018-10-05activitypub: always track following state for async reasonsWilliam Pitcock
2018-10-05activitypub transmogrifier: better manage follow stateWilliam Pitcock
2018-10-05user: only pre-create follow relationships on OStatusWilliam Pitcock
closes #306
2018-10-05Merge branch 'revert-d31bbb1c' into 'develop'kaniini
Rich Text Redo Branch See merge request pleroma/pleroma!314
2018-10-05test: update test for new html scrub policyWilliam Pitcock
2018-10-05nodeinfo: add accepted post formats to metadataWilliam Pitcock
2018-10-05config: allow for accepted post formats to be configuredWilliam Pitcock
2018-10-05formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directlyWilliam Pitcock
2018-10-05twitterapi: frontend config: add formattingOptionsEnabledWilliam Pitcock
2018-10-05Revert "Merge branch 'revert-a26d5e6b' into 'develop'"William Pitcock
This reverts commit d31bbb1cfe04ca6073a322bcf77239e7d4b79839, reversing changes made to 340ab3cb9068d444b77213e07beb8c2c3ca128b9.
2018-10-05Merge branch 'feature/nodeinfo_federation_info' into 'develop'kaniini
Nodeinfo federation info See merge request pleroma/pleroma!367
2018-10-05nodeinfo_controller: Fix JSON renderingHaelwenn (lanodan) Monnier
This is the last noedinfo difference from my own branch
2018-10-05MRF TransparencyHaelwenn (lanodan) Monnier
2018-10-05Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of ↵Haelwenn (lanodan) Monnier
previous one
2018-10-05[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF SimpleHaelwenn (lanodan) Monnier
2018-09-30Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'kaniini
activitypub: fix error condition match See merge request pleroma/pleroma!365
2018-09-30activitypub: fix error condition matchWilliam Pitcock
2018-09-28Relax form-action content security policybarrucadu
'self' only allows forms submitted to the same origin, which breaks the "remote follow" form. To allow remote following, we want to allow forms to be submitted to any host.
2018-09-28Merge branch 'bugfix/magnet-links' into 'develop'Haelwenn
formatter: Stop using phoenix HTML and format it ourselves Closes #307 See merge request pleroma/pleroma!363
2018-09-28formatter: Stop using phoenix HTML and format it ourselvesHaelwenn (lanodan) Monnier
* Pheonix has an extra scheme whitelist conflicting with ours * Pheonix doesn’t seems to do URL encoding, just HTML encoding Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
2018-09-28Merge branch 'feature/twitter_api/fields' into 'develop'Haelwenn
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields" See merge request pleroma/pleroma!360
2018-09-28[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fieldsHaelwenn (lanodan) Monnier
2018-09-28[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"Haelwenn (lanodan) Monnier
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-22Mastodon API: Support push subscription CRUDMartin Kühl
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-27 22:03:50 +0000