Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,666 Commits 1 Branch 0 Tags 222 MiB
3326205f95
Commit Graph

1666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Pitcock
47c7e259c4 activitypub transmogrifier: fix locked account state from being clobbered 2018-06-08 02:52:29 +00:00
William Pitcock
a003bdc30a activitypub transmogrifier: learn locked state in Update messages 2018-06-08 02:52:24 +00:00
lambda
839cb7b424 Merge branch 'develop' into 'mastopost' 
# Conflicts:
#   .gitignore
 2018-06-07 16:29:33 +00:00
lambda
595ca3bb3a Merge branch 'feature/quarantine' into 'develop' 
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.

See merge request pleroma/pleroma!199
 2018-06-07 14:44:08 +00:00
lambda
b114808a10 Merge branch 'import' into 'develop' 
Fix follow errors

See merge request pleroma/pleroma!198
 2018-06-07 14:42:32 +00:00
William Pitcock
09604182d0 add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer. 2018-06-07 14:38:09 +00:00
Rachel H
1525a0404b Fix follow errors 2018-06-07 00:39:24 -07:00
Sir_Boops
3f0440ac3c
Dedupe uploads 2018-06-06 13:25:44 -06:00
Rachel H
b4292295d7 Allow posting images without text in mastofe 2018-06-06 11:29:49 -07:00
eal
29c9c8d93b Extract host from ap_id, add index 2018-06-06 21:13:40 +03:00
lambda
0a0c6bf394 Merge branch 'bugfix/webfinger-xml-crash' into 'develop' 
webfinger robustness improvements

See merge request pleroma/pleroma!195
 2018-06-06 16:44:44 +00:00
William Pitcock
1620ec502c testsuite: update fixture URIs that were http 2018-06-06 16:36:58 +00:00
William Pitcock
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
 2018-06-06 16:27:14 +00:00
William Pitcock
aaa81d3540 XML: handle erlang errors too 2018-06-06 16:27:13 +00:00
lambda
b5d8213e70 Merge branch 'fix/oauth-http-basic' into 'develop' 
Make OAuth token endpoint work with HTTP Basic auth

See merge request pleroma/pleroma!191
 2018-06-06 08:27:08 +00:00
D Anzorge
2cebaa7d3a Add OAuth controller tests 
Tests for Pleroma.Web.OAuth.OAuthController
 2018-06-06 03:18:11 +02:00
D Anzorge
3607dc4558 Make token exchange return errors with 400 as status code 2018-06-06 03:14:50 +02:00
eal
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
 2018-06-05 21:18:25 +00:00
D Anzorge
73904e8f78 Make OAuth token endpoint work with HTTP Basic auth 
client_id/client_secret can now be supplied in an Authorization header
 2018-06-04 00:59:00 +02:00
eal
9075b6d25b ActivityPub.ex: filter domain blocked activities. 2018-06-03 23:33:33 +03:00
lambda
04c584391c Merge branch 'develop' into 'develop' 
Added: caddy webserver config example

Closes #192

See merge request pleroma/pleroma!189
 2018-06-03 19:52:48 +00:00
eal
4856962434 MastoAPI: add domain blocking. 2018-06-03 22:21:23 +03:00
lain
8073af6e10 Better error handling for OstatusController. 2018-06-03 21:04:44 +02:00
eal
87566b6e2f user.ex: add domain blocks. 2018-06-03 22:01:37 +03:00
witti
13925e0eb3 caddy config example 2018-06-03 20:13:33 +02:00
lain
06439f64d0 Better error handling for ActivityPubController 2018-06-03 19:58:59 +02:00
lain
4856ba596f Better error handling for MastodonApiController. 2018-06-03 19:28:11 +02:00
lain
0f70e83e8c Better error handling in TwitterApiController. 2018-06-03 19:11:22 +02:00
Haelwenn (lanodan) Monnier
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
 2018-06-03 18:41:18 +02:00
lain
9d054d30bc Revert "Update Mastofe." 
This reverts commit 726b131b0a.

Some things broke (threads).
 2018-06-02 19:45:23 +02:00
lain
726b131b0a Update Mastofe. 2018-06-02 16:11:38 +02:00
lain
da9cbf2c05 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-06-02 15:39:21 +02:00
eal
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
 2018-06-01 09:35:29 +00:00
eal
8c609ee3f9 MastoAPI user timelines: render statuses for the logged in user. 2018-06-01 12:30:11 +03:00
lambda
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
 2018-06-01 08:51:04 +00:00
eal
935e544e19 TwitterAPI: fix "Follows you" being shown for the wrong user. 2018-05-31 15:27:42 +03:00
lain
5e76adb07e Fix url guessing attacks. 2018-05-30 20:00:45 +02:00
lain
349400c06a Fix url guessing attacks. 2018-05-30 20:00:27 +02:00
eal
5d3fdbc082 MastoAPI: Add streaming for lists. 2018-05-30 16:48:59 +03:00
eal
196d36a7d5 Merge branch 'fix/dm-timeline-activities' into 'develop' 
MastoAPI: fix dm_timeline getting non-create activities.

See merge request pleroma/pleroma!182
 2018-05-30 12:31:59 +00:00
eal
7cb2e2971e MastoAPI: fix dm_timeline getting non-create activities. 2018-05-30 15:02:22 +03:00
lambda
8bd7ace420 Merge branch 'patch-3' into 'develop' 
Update pleroma.nginx

See merge request pleroma/pleroma!179
 2018-05-29 10:58:43 +00:00
lambda
52b0413719 Merge branch 'fix/link-headers' into 'develop' 
MastoAPI: Fix link headers with restrictive params.

See merge request pleroma/pleroma!181
 2018-05-29 10:58:27 +00:00
eal
35cb8969c4 MastoAPI: Fix link headers with restrictive params. 2018-05-29 13:31:36 +03:00
lain
461f201caa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-05-28 12:39:49 +02:00
lain
3ece4a3ebc Only return certain activities in TwitterAPI mentions. 2018-05-28 12:38:48 +02:00
Dominik V. Salonen
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.
 2018-05-28 10:36:27 +00:00
lambda
8216d5e40e Merge branch 'feature/mastodon-context-microformat' into 'develop' 
formatter: use class='mention' on links to user profiles

See merge request pleroma/pleroma!178
 2018-05-27 13:16:10 +00:00
William Pitcock
d7eb2e1b65 run mix format 2018-05-27 13:06:38 +00:00
William Pitcock
f569b67cda tests: update for html changes 2018-05-27 13:03:34 +00:00