Closes: pleroma/pleroma#320

security: fix local locked accounts

Closes #316

See merge request pleroma/pleroma!372

common api: take the combination of the subject and content for length limit enforcement

Closes #315

See merge request pleroma/pleroma!371

closes #315

nodeinfo: allow opting out of MRF transparency

See merge request pleroma/pleroma!370

AP follows must be always async (closes #306)

Closes #306

See merge request pleroma/pleroma!368

Relax form-action content security policy in sample nginx config

See merge request pleroma/pleroma!364

update-pleroma-frontend

See merge request pleroma/pleroma!369

closes #306

Rich Text Redo Branch

See merge request pleroma/pleroma!314

This reverts commit d31bbb1c, reversing
changes made to 340ab3cb.

Nodeinfo federation info

See merge request pleroma/pleroma!367

This is the last noedinfo difference from my own branch

activitypub: fix error condition match

See merge request pleroma/pleroma!365

'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.

formatter: Stop using phoenix HTML and format it ourselves

Closes #307

See merge request pleroma/pleroma!363

* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding

Closes: pleroma/pleroma#307

[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"

See merge request pleroma/pleroma!360