summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
Pleroma list belongs Closes #333 See merge request pleroma/pleroma!382
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
lib/pleroma/html.ex: Fix scheme lists See merge request pleroma/pleroma!377
2018-10-18html scrubbing policies: restrict img tags to http/https only for mediaproxy ↵William Pitcock
compatibility
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
fix osada mentions Closes #324 See merge request pleroma/pleroma!380
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
Use maybe_direct_follow for follow imports See merge request pleroma/pleroma!378
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
Gosh please don’t break ourselves… Also this is copy-paste of the list in lib/pleroma/formatter.ex, I think this should be put in a common variable, but where?
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-10 16:33:13 +0000