squidboi
|
08fc1ba382
|
more rewording (x2)
|
6 years ago |
|
squidboi
|
0921489809
|
more rewording
|
6 years ago |
|
squidboi
|
01b2dc19cc
|
super-minor rewording
|
6 years ago |
|
squidboi
|
837792b015
|
added CONFIGURATION.md containing some details about configuring mrf
|
6 years ago |
|
squidboi
|
07f0cfa53f
|
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
|
6 years ago |
|
lambda
|
45a935f0bd
|
Merge branch 'users' into 'develop'
Fix users lookup/return type
See merge request pleroma/pleroma!201
|
6 years ago |
|
lambda
|
bb639a362e
|
Merge branch 'feature/rejectnonpublic' into 'develop'
Add MRF to drop all posts with "followers-only" or "direct" privacy settings
See merge request pleroma/pleroma!202
|
6 years ago |
|
Rachel H
|
fa0c2727d8
|
Fix users lookup/return type
* Allow viewing user in frontend by id on pageload
|
6 years ago |
|
lambda
|
4a16ade2ee
|
Merge branch 'mastopost' into 'develop'
Allow posting images without text in mastofe
See merge request pleroma/pleroma!194
|
6 years ago |
|
squidboi
|
e2c4013c88
|
s/get_by_ap_id/get_cached_by_ap_id/
|
6 years ago |
|
squidboi
|
6e7f91bf8f
|
final format
|
6 years ago |
|
squidboi
|
82225dfc8d
|
even more formatting
|
6 years ago |
|
lambda
|
c86823f724
|
Merge branch 'bugfix/locked-account-regression' into 'develop'
security fix: locked account regression
See merge request pleroma/pleroma!200
|
6 years ago |
|
squidboi
|
990cde7439
|
more formatting
|
6 years ago |
|
squidboi
|
5b9e1f228a
|
formatting
|
6 years ago |
|
squidboi
|
f69d38e455
|
add mrf for dropping follower-only and direct posts
|
6 years ago |
|
William Pitcock
|
1e9dd6fbc2
|
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly
|
6 years ago |
|
William Pitcock
|
299ef74f2e
|
tests: add regression test for locking/unlocking account updates
|
6 years ago |
|
William Pitcock
|
47c7e259c4
|
activitypub transmogrifier: fix locked account state from being clobbered
|
6 years ago |
|
William Pitcock
|
a003bdc30a
|
activitypub transmogrifier: learn locked state in Update messages
|
6 years ago |
|
lambda
|
839cb7b424
|
Merge branch 'develop' into 'mastopost'
# Conflicts:
# .gitignore
|
6 years ago |
|
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
|
6 years ago |
|
lambda
|
b114808a10
|
Merge branch 'import' into 'develop'
Fix follow errors
See merge request pleroma/pleroma!198
|
6 years ago |
|
William Pitcock
|
09604182d0
|
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
|
6 years ago |
|
Rachel H
|
1525a0404b
|
Fix follow errors
|
6 years ago |
|
Rachel H
|
b4292295d7
|
Allow posting images without text in mastofe
|
6 years ago |
|
lambda
|
0a0c6bf394
|
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
webfinger robustness improvements
See merge request pleroma/pleroma!195
|
6 years ago |
|
William Pitcock
|
1620ec502c
|
testsuite: update fixture URIs that were http
|
6 years ago |
|
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
|
6 years ago |
|
William Pitcock
|
aaa81d3540
|
XML: handle erlang errors too
|
6 years ago |
|
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
|
6 years ago |
|
D Anzorge
|
2cebaa7d3a
|
Add OAuth controller tests
Tests for Pleroma.Web.OAuth.OAuthController
|
6 years ago |
|
D Anzorge
|
3607dc4558
|
Make token exchange return errors with 400 as status code
|
6 years ago |
|
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
|
6 years ago |
|
D Anzorge
|
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 |
|
lambda
|
04c584391c
|
Merge branch 'develop' into 'develop'
Added: caddy webserver config example
Closes #192
See merge request pleroma/pleroma!189
|
6 years ago |
|
lain
|
8073af6e10
|
Better error handling for OstatusController.
|
6 years ago |
|
witti
|
13925e0eb3
|
caddy config example
|
6 years ago |
|
lain
|
06439f64d0
|
Better error handling for ActivityPubController
|
6 years ago |
|
lain
|
4856ba596f
|
Better error handling for MastodonApiController.
|
6 years ago |
|
lain
|
0f70e83e8c
|
Better error handling in TwitterApiController.
|
6 years ago |
|
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
|
6 years ago |
|
lain
|
9d054d30bc
|
Revert "Update Mastofe."
This reverts commit 726b131b0a.
Some things broke (threads).
|
6 years ago |
|
lain
|
726b131b0a
|
Update Mastofe.
|
6 years ago |
|
lain
|
da9cbf2c05
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
6 years ago |
|
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
|
6 years ago |
|
eal
|
8c609ee3f9
|
MastoAPI user timelines: render statuses for the logged in user.
|
6 years ago |
|
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
|
6 years ago |
|
eal
|
935e544e19
|
TwitterAPI: fix "Follows you" being shown for the wrong user.
|
6 years ago |
|
lain
|
5e76adb07e
|
Fix url guessing attacks.
|
6 years ago |
