summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-14Merge branch 'feature/markdown-enable-tags' into 'develop'kaniini
common api: enable tag linking in markdown mode Closes #322 See merge request pleroma/pleroma!376
2018-10-14common api: enable tag linking in markdown modeWilliam Pitcock
2018-10-14Merge branch 'security/clear-oauth-with-password' into 'develop'kaniini
Delete Tokens and Authorizations on password change Closes #320 See merge request pleroma/pleroma!375
2018-10-14Delete Tokens and Authorizations on password changeHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
2018-10-11Merge branch 'security/fix-local-locked-accounts' into 'develop'kaniini
security: fix local locked accounts Closes #316 See merge request pleroma/pleroma!372
2018-10-11user: break out local cases for maybe_direct_followWilliam Pitcock
2018-10-11test: add regression test for #316William Pitcock
2018-10-11user: local users are always AP-enabled (closes #316)William Pitcock
2018-10-10Merge branch 'bugfix/length-enforce-subjects' into 'develop'kaniini
common api: take the combination of the subject and content for length limit enforcement Closes #315 See merge request pleroma/pleroma!371
2018-10-10common api: take the combination of the subject and content for length limit ↵William Pitcock
enforcement closes #315
2018-10-07Merge branch 'feature/mrf-transparency-opt-out' into 'develop'Haelwenn
nodeinfo: allow opting out of MRF transparency See merge request pleroma/pleroma!370
2018-10-07nodeinfo: allow opting out of MRF transparencyWilliam Pitcock
2018-10-07Merge branch 'security/follow-always-async' into 'develop'kaniini
AP follows must be always async (closes #306) Closes #306 See merge request pleroma/pleroma!368
2018-10-07Merge branch 'patch-2' into 'develop'kaniini
Relax form-action content security policy in sample nginx config See merge request pleroma/pleroma!364
2018-10-07Merge branch 'update-pleroma-frontend' into 'develop'kaniini
update-pleroma-frontend See merge request pleroma/pleroma!369
2018-10-07{mastodon api, twitter api}: make the follow handshake timeout configurableWilliam Pitcock
2018-10-07update-pleroma-frontendhakabahitoyo
2018-10-05mastodon api: relationship view: better handle no pre-existing follow activityWilliam Pitcock
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 12:18:55 +0000