Haelwenn (lanodan) Monnier
eacab0fb05
Delete Tokens and Authorizations on password change
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
6 years ago
kaniini
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
William Pitcock
51eaece3ea
user: break out local cases for maybe_direct_follow
6 years ago
William Pitcock
ebc32045f0
test: add regression test for #316
6 years ago
William Pitcock
2c29329d39
user: local users are always AP-enabled ( closes #316 )
6 years ago
kaniini
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
William Pitcock
111841ad34
common api: take the combination of the subject and content for length limit enforcement
...
closes #315
6 years ago
Haelwenn
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
William Pitcock
08d5ad71b6
nodeinfo: allow opting out of MRF transparency
6 years ago
kaniini
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
kaniini
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
kaniini
a15eac05a6
Merge branch 'update-pleroma-frontend' into 'develop'
...
update-pleroma-frontend
See merge request pleroma/pleroma!369
6 years ago
William Pitcock
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
hakabahitoyo
be7bb90bef
update-pleroma-frontend
6 years ago
William Pitcock
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
6 years ago
William Pitcock
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
6 years ago
William Pitcock
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
6 years ago
William Pitcock
a71b822013
activitypub: always track following state for async reasons
6 years ago
William Pitcock
8ce217776d
activitypub transmogrifier: better manage follow state
6 years ago
William Pitcock
4f7a468659
user: only pre-create follow relationships on OStatus
...
closes #306
6 years ago
kaniini
614e47aa7c
Merge branch 'revert-d31bbb1c' into 'develop'
...
Rich Text Redo Branch
See merge request pleroma/pleroma!314
6 years ago
William Pitcock
497814cbbb
test: update test for new html scrub policy
6 years ago
William Pitcock
bd76d9cee6
nodeinfo: add accepted post formats to metadata
6 years ago
William Pitcock
285ac80c36
config: allow for accepted post formats to be configured
6 years ago
William Pitcock
52b05137c5
formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
William Pitcock
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
William Pitcock
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe
, reversing
changes made to 340ab3cb90
.
6 years ago
kaniini
f7ba393bb9
Merge branch 'feature/nodeinfo_federation_info' into 'develop'
...
Nodeinfo federation info
See merge request pleroma/pleroma!367
6 years ago
Haelwenn (lanodan) Monnier
f2efc8dcfb
nodeinfo_controller: Fix JSON rendering
...
This is the last noedinfo difference from my own branch
6 years ago
Haelwenn (lanodan) Monnier
28651df478
MRF Transparency
6 years ago
Haelwenn (lanodan) Monnier
56d31db130
Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one
6 years ago
Haelwenn (lanodan) Monnier
8226953f1d
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple
6 years ago
kaniini
4f03bb2299
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
...
activitypub: fix error condition match
See merge request pleroma/pleroma!365
6 years ago
William Pitcock
4db1bc2c0e
activitypub: fix error condition match
6 years ago
barrucadu
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
Haelwenn
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
Haelwenn (lanodan) Monnier
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
Haelwenn
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
Haelwenn (lanodan) Monnier
a74daabfae
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
6 years ago
Haelwenn (lanodan) Monnier
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
6 years ago
kaniini
dbc9feecbf
Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'
...
activitypub: don't fall back to OStatus fetching when MRF rejects an object
See merge request pleroma/pleroma!362
6 years ago
William Pitcock
707077edde
activitypub: don't fall back to OStatus fetching when MRF rejects an object
6 years ago
kaniini
db989d1fa4
Merge branch 'security/ap-unsigned-create' into 'develop'
...
activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else
See merge request pleroma/pleroma!361
6 years ago
William Pitcock
5c312ad677
activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else
...
although the previous handling assumed any unsigned/invalid signature message was a Create,
lets make it more explicit
6 years ago
kaniini
6258ddaa60
Merge branch 'bugfix/kroeg' into 'develop'
...
More kroeg bugfixes
See merge request pleroma/pleroma!353
6 years ago
Haelwenn (lanodan) Monnier
c739737998
transmogrifier: get_actor called without casting attributedTo in actor and actor is nil
6 years ago
Haelwenn (lanodan) Monnier
9446b02bdf
transmogrifier: Just make attachement maps into a list and reroll
6 years ago
Haelwenn (lanodan) Monnier
e53da692fb
transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on
6 years ago
William Pitcock
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
6 years ago
Haelwenn (lanodan) Monnier
4c3a80de96
transmogrifier: Use oneliners when applicable
6 years ago