squidboi
|
e2c4013c88
|
s/get_by_ap_id/get_cached_by_ap_id/
|
2018-06-07 22:33:50 -07:00 |
|
squidboi
|
6e7f91bf8f
|
final format
|
2018-06-07 22:14:39 -07:00 |
|
squidboi
|
82225dfc8d
|
even more formatting
|
2018-06-07 22:10:11 -07:00 |
|
lambda
|
c86823f724
|
Merge branch 'bugfix/locked-account-regression' into 'develop'
security fix: locked account regression
See merge request pleroma/pleroma!200
|
2018-06-08 05:10:08 +00:00 |
|
squidboi
|
990cde7439
|
more formatting
|
2018-06-07 22:03:24 -07:00 |
|
squidboi
|
5b9e1f228a
|
formatting
|
2018-06-07 21:55:58 -07:00 |
|
squidboi
|
f69d38e455
|
add mrf for dropping follower-only and direct posts
|
2018-06-07 21:00:57 -07:00 |
|
William Pitcock
|
1e9dd6fbc2
|
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly
|
2018-06-08 02:52:36 +00:00 |
|
William Pitcock
|
299ef74f2e
|
tests: add regression test for locking/unlocking account updates
|
2018-06-08 02:52:34 +00:00 |
|
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 |
|