Commit Graph

2331 Commits (181f3bb56a0bc0211ddd2e8f215d93973222b405)
 

Author SHA1 Message Date
kaniini 4b2a586942 Merge branch 'update-pleroma-frontend' into 'develop'
6 years ago
kaniini 8cc08b94ec Merge branch 'security/add-security-directives-to-systemd-example' into 'develop'
6 years ago
shibayashi 043cb7138e
Add a little bit more detail in the comments.
6 years ago
shibayashi 0a58428de6
Add some security related directives to the systemd service example
6 years ago
scarlett 7cb227dc62 update pleroma-fe
6 years ago
scarlett f6dda65dda update pleroma-fe
6 years ago
kaniini 945ce9910d Merge branch 'bugfix/html-scrub-comments' into 'develop'
6 years ago
kaniini bcae57afd2 Merge branch 'new-frontend-options' into 'develop'
6 years ago
William Pitcock 8613db0e3b html: ensure comments are correctly scrubbed
6 years ago
scarlett 3e79d941c8 Defaults for new frontend options in config.exs
6 years ago
scarlett a253c1466e New frontend options
6 years ago
eal aaf3fc1575 Merge branch 'pleroma-list-belongs' into 'develop'
6 years ago
eal 5e9a0e2460 Fix some typos in the list test.
6 years ago
AkiraFukushima a249cbf187 Add a test for List.get_lists_account_belongs
6 years ago
AkiraFukushima e8c698af41 Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
6 years ago
kaniini ad3181895c Merge branch 'bugfix/html-scrub-schemes' into 'develop'
6 years ago
William Pitcock 595d855f0e html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility
6 years ago
Haelwenn (lanodan) Monnier 2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
kaniini 6098070234 Merge branch 'bugfix/osada-mention' into 'develop'
6 years ago
William Pitcock 958c5e02e8 tests: add a testcase for matching osada users in the formatter
6 years ago
William Pitcock 582dbe5c8d formatter: fix matching osada users
6 years ago
Haelwenn c7140c67c7 Merge branch 'import-maybe-direct-follow' into 'develop'
6 years ago
scarlett 7562912f6a Use maybe_direct_follow for follow imports
6 years ago
Haelwenn (lanodan) Monnier d7654c77de
lib/pleroma/html.ex: Use a function as a variable (broken for some reason)
6 years ago
Haelwenn (lanodan) Monnier 50e0a9ae56
lib/pleroma/html.ex: Fix scheme lists
6 years ago
kaniini c93571b87e Merge branch 'feature/markdown-enable-tags' into 'develop'
6 years ago
William Pitcock 30efa86c05 common api: enable tag linking in markdown mode
6 years ago
kaniini e0c035589a Merge branch 'security/clear-oauth-with-password' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier eacab0fb05
Delete Tokens and Authorizations on password change
6 years ago
kaniini 117e005409 Merge branch 'security/fix-local-locked-accounts' into 'develop'
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'
6 years ago
William Pitcock 111841ad34 common api: take the combination of the subject and content for length limit enforcement
6 years ago
Haelwenn 5294b11ef0 Merge branch 'feature/mrf-transparency-opt-out' into 'develop'
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'
6 years ago
kaniini b638cc50b6 Merge branch 'patch-2' into 'develop'
6 years ago
kaniini a15eac05a6 Merge branch 'update-pleroma-frontend' into 'develop'
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
6 years ago
kaniini 614e47aa7c Merge branch 'revert-d31bbb1c' into 'develop'
6 years ago
William Pitcock 497814cbbb test: update test for new html scrub policy
6 years ago