summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-10-25Merge branch 'security/add-security-directives-to-systemd-example' into 'deve...kaniini
2018-10-25Add a little bit more detail in the comments.shibayashi
2018-10-25Add some security related directives to the systemd service exampleshibayashi
2018-10-23update pleroma-fescarlett
2018-10-23update pleroma-fescarlett
2018-10-23Merge branch 'bugfix/html-scrub-comments' into 'develop'kaniini
2018-10-23Merge branch 'new-frontend-options' into 'develop'kaniini
2018-10-23html: ensure comments are correctly scrubbedWilliam Pitcock
2018-10-21Defaults for new frontend options in config.exsscarlett
2018-10-21New frontend optionsscarlett
2018-10-20Merge branch 'pleroma-list-belongs' into 'develop'eal
2018-10-20Fix some typos in the list test.eal
2018-10-19Add a test for List.get_lists_account_belongsAkiraFukushima
2018-10-19Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongsAkiraFukushima
2018-10-18Merge branch 'bugfix/html-scrub-schemes' into 'develop'kaniini
2018-10-18html scrubbing policies: restrict img tags to http/https only for mediaproxy ...William Pitcock
2018-10-18lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemesHaelwenn (lanodan) Monnier
2018-10-17Merge branch 'bugfix/osada-mention' into 'develop'kaniini
2018-10-17tests: add a testcase for matching osada users in the formatterWilliam Pitcock
2018-10-17formatter: fix matching osada usersWilliam Pitcock
2018-10-17Merge branch 'import-maybe-direct-follow' into 'develop'Haelwenn
2018-10-17Use maybe_direct_follow for follow importsscarlett
2018-10-16lib/pleroma/html.ex: Use a function as a variable (broken for some reason)Haelwenn (lanodan) Monnier
2018-10-16lib/pleroma/html.ex: Fix scheme listsHaelwenn (lanodan) Monnier
2018-10-14Merge branch 'feature/markdown-enable-tags' into 'develop'kaniini
2018-10-14common api: enable tag linking in markdown modeWilliam Pitcock
2018-10-14Merge branch 'security/clear-oauth-with-password' into 'develop'kaniini
2018-10-14Delete Tokens and Authorizations on password changeHaelwenn (lanodan) Monnier
2018-10-11Merge branch 'security/fix-local-locked-accounts' into 'develop'kaniini
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
2018-10-10common api: take the combination of the subject and content for length limit ...William Pitcock
2018-10-07Merge branch 'feature/mrf-transparency-opt-out' into 'develop'Haelwenn
2018-10-07nodeinfo: allow opting out of MRF transparencyWilliam Pitcock
2018-10-07Merge branch 'security/follow-always-async' into 'develop'kaniini
2018-10-07Merge branch 'patch-2' into 'develop'kaniini
2018-10-07Merge branch 'update-pleroma-frontend' into 'develop'kaniini
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 `reques...William Pitcock
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
2018-10-05Merge branch 'revert-d31bbb1c' into 'develop'kaniini
2018-10-05test: update test for new html scrub policyWilliam Pitcock
2018-10-05nodeinfo: add accepted post formats to metadataWilliam Pitcock