595d855f0e
html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility
6 years ago
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
6098070234
Merge branch 'bugfix/osada-mention' into 'develop'
...
fix osada mentions
Closes #324
See merge request pleroma/pleroma!380
6 years ago
958c5e02e8
tests: add a testcase for matching osada users in the formatter
6 years ago
582dbe5c8d
formatter: fix matching osada users
6 years ago
c7140c67c7
Merge branch 'import-maybe-direct-follow' into 'develop'
...
Use maybe_direct_follow for follow imports
See merge request pleroma/pleroma!378
6 years ago
7562912f6a
Use maybe_direct_follow for follow imports
6 years ago
d7654c77de
lib/pleroma/html.ex: Use a function as a variable (broken for some reason)
6 years ago
50e0a9ae56
lib/pleroma/html.ex: Fix scheme lists
...
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?
6 years ago
c93571b87e
Merge branch 'feature/markdown-enable-tags' into 'develop'
...
common api: enable tag linking in markdown mode
Closes #322
See merge request pleroma/pleroma!376
6 years ago
30efa86c05
common api: enable tag linking in markdown mode
6 years ago
e0c035589a
Merge branch 'security/clear-oauth-with-password' into 'develop'
...
Delete Tokens and Authorizations on password change
Closes #320
See merge request pleroma/pleroma!375
6 years ago
eacab0fb05
Delete Tokens and Authorizations on password change
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
6 years ago
117e005409
Merge branch 'security/fix-local-locked-accounts' into 'develop'
...
security: fix local locked accounts
Closes #316
See merge request pleroma/pleroma!372
6 years ago
51eaece3ea
user: break out local cases for maybe_direct_follow
6 years ago
ebc32045f0
test: add regression test for #316
6 years ago
2c29329d39
user: local users are always AP-enabled ( closes #316 )
6 years ago
3a77336d89
Merge branch 'bugfix/length-enforce-subjects' into 'develop'
...
common api: take the combination of the subject and content for length limit enforcement
Closes #315
See merge request pleroma/pleroma!371
6 years ago
111841ad34
common api: take the combination of the subject and content for length limit enforcement
...
closes #315
6 years ago
5294b11ef0
Merge branch 'feature/mrf-transparency-opt-out' into 'develop'
...
nodeinfo: allow opting out of MRF transparency
See merge request pleroma/pleroma!370
6 years ago
08d5ad71b6
nodeinfo: allow opting out of MRF transparency
6 years ago
4a3a46074d
Merge branch 'security/follow-always-async' into 'develop'
...
AP follows must be always async (closes #306 )
Closes #306
See merge request pleroma/pleroma!368
6 years ago
b638cc50b6
Merge branch 'patch-2' into 'develop'
...
Relax form-action content security policy in sample nginx config
See merge request pleroma/pleroma!364
6 years ago
a15eac05a6
Merge branch 'update-pleroma-frontend' into 'develop'
...
update-pleroma-frontend
See merge request pleroma/pleroma!369
6 years ago
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
be7bb90bef
update-pleroma-frontend
6 years ago
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
6 years ago
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
6 years ago
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
6 years ago
a71b822013
activitypub: always track following state for async reasons
6 years ago
8ce217776d
activitypub transmogrifier: better manage follow state
6 years ago
4f7a468659
user: only pre-create follow relationships on OStatus
...
closes #306
6 years ago
614e47aa7c
Merge branch 'revert-d31bbb1c' into 'develop'
...
Rich Text Redo Branch
See merge request pleroma/pleroma!314
6 years ago
497814cbbb
test: update test for new html scrub policy
6 years ago
bd76d9cee6
nodeinfo: add accepted post formats to metadata
6 years ago
285ac80c36
config: allow for accepted post formats to be configured
6 years ago
52b05137c5
formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
6 years ago
f7ba393bb9
Merge branch 'feature/nodeinfo_federation_info' into 'develop'
...
Nodeinfo federation info
See merge request pleroma/pleroma!367
6 years ago
f2efc8dcfb
nodeinfo_controller: Fix JSON rendering
...
This is the last noedinfo difference from my own branch
6 years ago
28651df478
MRF Transparency
6 years ago
56d31db130
Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one
6 years ago
8226953f1d
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple
6 years ago
4f03bb2299
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
...
activitypub: fix error condition match
See merge request pleroma/pleroma!365
6 years ago
4db1bc2c0e
activitypub: fix error condition match
6 years ago
a32e013909
Relax form-action content security policy
...
'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.
6 years ago
ab2e5ba989
Merge branch 'bugfix/magnet-links' into 'develop'
...
formatter: Stop using phoenix HTML and format it ourselves
Closes #307
See merge request pleroma/pleroma!363
6 years ago
a3cffd3566
formatter: Stop using phoenix HTML and format it ourselves
...
* 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
6 years ago
34b6d444d6
Merge branch 'feature/twitter_api/fields' into 'develop'
...
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
See merge request pleroma/pleroma!360
6 years ago
William Pitcock