0a0c6bf394
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
...
webfinger robustness improvements
See merge request pleroma/pleroma!195
6 years ago
1620ec502c
testsuite: update fixture URIs that were http
6 years ago
1abf0f3b3e
webfinger: use https as default fallback instead of http
...
realistically, all instances need to be on https anyway to properly federate with all
software
6 years ago
aaa81d3540
XML: handle erlang errors too
6 years ago
b5d8213e70
Merge branch 'fix/oauth-http-basic' into 'develop'
...
Make OAuth token endpoint work with HTTP Basic auth
See merge request pleroma/pleroma!191
6 years ago
2cebaa7d3a
Add OAuth controller tests
...
Tests for Pleroma.Web.OAuth.OAuthController
6 years ago
3607dc4558
Make token exchange return errors with 400 as status code
6 years ago
f9719b064c
Merge branch 'fix/emoji-picker' into 'develop'
...
set visible_in_picker to true in custom_emojis
Closes #177 and mastofe#16
See merge request pleroma/pleroma!188
6 years ago
73904e8f78
Make OAuth token endpoint work with HTTP Basic auth
...
client_id/client_secret can now be supplied in an Authorization header
6 years ago
9075b6d25b
ActivityPub.ex: filter domain blocked activities.
6 years ago
04c584391c
Merge branch 'develop' into 'develop'
...
Added: caddy webserver config example
Closes #192
See merge request pleroma/pleroma!189
6 years ago
4856962434
MastoAPI: add domain blocking.
6 years ago
8073af6e10
Better error handling for OstatusController.
6 years ago
87566b6e2f
user.ex: add domain blocks.
6 years ago
13925e0eb3
caddy config example
6 years ago
06439f64d0
Better error handling for ActivityPubController
6 years ago
4856ba596f
Better error handling for MastodonApiController.
6 years ago
0f70e83e8c
Better error handling in TwitterApiController.
6 years ago
b143694b98
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis
...
Fixes: https://github.com/ilianaw/emojos.in/issues/4
Closes: https://git.pleroma.social/pleroma/pleroma/issues/177
Closes: https://git.pleroma.social/pleroma/mastofe/issues/16
6 years ago
9d054d30bc
Revert "Update Mastofe."
...
This reverts commit 726b131b0a
6 years ago
726b131b0a
Update Mastofe.
6 years ago
da9cbf2c05
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
dca1d6d162
Merge branch 'fix/user-timeline-reading-user' into 'develop'
...
MastoAPI user timelines: render statuses for the logged in user.
See merge request pleroma/pleroma!187
6 years ago
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
6 years ago
98b8f08783
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
...
TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185
6 years ago
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
6 years ago
5e76adb07e
Fix url guessing attacks.
6 years ago
349400c06a
Fix url guessing attacks.
6 years ago
5d3fdbc082
MastoAPI: Add streaming for lists.
6 years ago
196d36a7d5
Merge branch 'fix/dm-timeline-activities' into 'develop'
...
MastoAPI: fix dm_timeline getting non-create activities.
See merge request pleroma/pleroma!182
6 years ago
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
6 years ago
8bd7ace420
Merge branch 'patch-3' into 'develop'
...
Update pleroma.nginx
See merge request pleroma/pleroma!179
6 years ago
52b0413719
Merge branch 'fix/link-headers' into 'develop'
...
MastoAPI: Fix link headers with restrictive params.
See merge request pleroma/pleroma!181
6 years ago
35cb8969c4
MastoAPI: Fix link headers with restrictive params.
6 years ago
461f201caa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
6 years ago
a6fd9c4b00
Update pleroma.nginx
...
proxy_ignore_client_abort will continue to fetch from upstream even if a client aborts the connection. This is highly recommended when cache is being used. If a client leaves/refreshes the page while a user's avatar or some other media is halfway loaded, the cached copy might in some cases be broken. Leaving future requests to the same URL broken until cache expires.
6 years ago
8216d5e40e
Merge branch 'feature/mastodon-context-microformat' into 'develop'
...
formatter: use class='mention' on links to user profiles
See merge request pleroma/pleroma!178
6 years ago
d7eb2e1b65
run mix format
6 years ago
f569b67cda
tests: update for html changes
6 years ago
a8df7fc690
formatter: use class='mention' on links to user profiles
...
helps mastodon frontend and apps have better context:
https://mastodon.social/users/Gargron/statuses/100101267352899379
6 years ago
a9e36e5a64
Fix user topic streaming.
6 years ago
46cc6fab07
Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop
6 years ago
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
6 years ago
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
6 years ago
6138b29783
There are no symbols in JSON.
6 years ago
745072b2cc
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
6 years ago
0a6c897c94
Formatting.
6 years ago
bfce29866f
Make Mastodon follow hack more explicit.
6 years ago
3839a11ef5
Don't treat remote accepts/rejects as local.
...
Also, use specialized functions to get safe data.
6 years ago
lambda