Commit Graph

2353 Commits (f584a603f95f95c7c8d2c1897b24b5c7399f4f74)
 

Author SHA1 Message Date
scarlett ae5beb7b64 Make finmoji optional
6 years ago
kaniini 63556150e1 Merge branch 'bugfix/user-inbox-bcc' into 'develop'
6 years ago
William Pitcock b1d1f9bc27 tests: add test for user inbox
6 years ago
William Pitcock ce70eb8c00 activitypub utils: fix user splicing
6 years ago
William Pitcock 2f1f1a4f30 activitypub: splice users into recipient lists when they receive messages at their personal inbox
6 years ago
kaniini 9e9b1bd5ea Merge branch 'bugfix/ap-uri-user-search' into 'develop'
6 years ago
Haelwenn 79b1e4465f Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'
6 years ago
William Pitcock 5383887bd4 transmogrifier: do not try to contain origin of something which doesn't have one
6 years ago
Haelwenn (lanodan) Monnier b386888a0e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4
6 years ago
kaniini 4646794ee2 Merge branch 'feature/add-in-reply-to-profileurl' into 'develop'
6 years ago
William Pitcock 6cfba7db8d tests: twitterapi: add additional fields
6 years ago
William Pitcock 1ed25c963a twitterapi: activity view: add the other in_reply_to fields
6 years ago
William Pitcock 1b480e3514 user: add helper for fetching profile url (which may be different than ap id)
6 years ago
Haelwenn (lanodan) Monnier b112112c11
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4
6 years ago
Haelwenn (lanodan) Monnier b0a940d5a2
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
6 years ago
Haelwenn (lanodan) Monnier 2da0ffeb28
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil
6 years ago
Haelwenn (lanodan) Monnier 0c10be8731
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
6 years ago
Haelwenn (lanodan) Monnier 3b0e9287a5
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
6 years ago
kaniini a8137159c2 Merge branch 'feature/in-reply-to-screen-name' into 'develop'
6 years ago
William Pitcock 9563f3766d tests: update for new in_reply_to_screen_name field
6 years ago
William Pitcock fee43ae5e7 twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
6 years ago
William Pitcock f3f736afc4 activity: add helper to fetch an activity's parent
6 years ago
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