summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-28mastodon websocket: return errors using ok, not stopWilliam Pitcock
2019-02-28mastodon websocket: bring back infinity timeoutWilliam Pitcock
2019-02-28Add search users endpointMaxim Filippov
2019-02-28mastodon websocket: use pattern match to get query data, robustly handle errorsWilliam Pitcock
2019-02-28config: update config for cowboy 2 endpointsWilliam Pitcock
2019-02-28mastodon api: websocket: update code for cowboy 2.xWilliam Pitcock
2019-02-28mix: update dependencies for cowboy 2.0William Pitcock
2019-02-28Add test for the second pageMaxim Filippov
2019-02-28Use Mastodon API views in Admin APIMaxim Filippov
2019-02-28Merge branch 'customizable_auth' into 'develop'href
Authenticator tweaks See merge request pleroma/pleroma!875
2019-02-28Renamed *DatabaseAuthenticator to *Authenticator.Ivan Tashkinov
2019-02-28Added `auth_template/0` to DatabaseAuthenticator.Ivan Tashkinov
2019-02-28Merge branch 'with-mutes' into 'develop'kaniini
Add `with_muted` param. Closes #683 See merge request pleroma/pleroma!872
2019-02-28Merge branch 'customizable_auth' into 'develop'href
Auth customization support See merge request pleroma/pleroma!852
2019-02-28Merge branch 'speedup-follow-requests' into 'develop'kaniini
Speedup follow requests Closes #677 See merge request pleroma/pleroma!871
2019-02-28Merge branch 'deactivated-in-user-view' into 'develop'kaniini
Add activation status to the regular user view See merge request pleroma/pleroma!874
2019-02-28Made auth customization be runtime-configurable.Ivan Tashkinov
2019-02-28Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'lambda
mastodon api: embed relationship card under account card for Pleroma FE convenience See merge request pleroma/pleroma!870
2019-02-28Added deactivated to the user vieweugenijm
2019-02-28Add pagination to users admin APIMaxim Filippov
2019-02-27Remove parts of the old activity view.lain
Not used anymore.
2019-02-27Add user muted status info to twitterapi.lain
2019-02-27Add user muted status info to MastodonAPI.lain
2019-02-27Add `with_muted` param.lain
2019-02-27Follower requests: Utilize object index.lain
Closes #677
2019-02-27Add follow request test.lain
2019-02-27mastodon api: embed relationship card under account card for Pleroma FE ↵William Pitcock
convenience
2019-02-27Merge branch 'fix/formatter' into 'develop'kaniini
Bugfix: markdown in formatter Closes #688 See merge request pleroma/pleroma!869
2019-02-27fix formatterEgor Kislitsyn
2019-02-27Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'kaniini
Add missing docs and tests to Admin API See merge request pleroma/pleroma!868
2019-02-27Add missing docs and testsMaxim Filippov
2019-02-26Merge branch 'auto_linker' into 'develop'kaniini
AutoLinker Closes #609 See merge request pleroma/pleroma!839
2019-02-26AutoLinkerEgor
2019-02-26Merge branch 'feature/more-actions-to-admin-api' into 'develop'kaniini
Add list/toggle activation endpoints to AdminController See merge request pleroma/pleroma!867
2019-02-27Add more admin actionsMaxim Filippov
2019-02-26Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'kaniini
need to put back ipv4 listen instruct See merge request pleroma/pleroma!866
2019-02-26need to put back ipv4 listen instructKenneth Zhao
2019-02-26Added missing copyright headers.Ivan Tashkinov
2019-02-26Merge remote-tracking branch 'remotes/origin/develop' into customizable_authIvan Tashkinov
2019-02-26Database authenticator behaviour / Pleroma implementation refactoring.Ivan Tashkinov
2019-02-26Merge branch 'nginx-cfg' into 'develop'Haelwenn
Add ipv6 handling to pleroma.nginx See merge request pleroma/pleroma!865
2019-02-25Add ipv6 handling to pleroma.nginxPEA
Replaces `listen 80` with `listen [::]:80`, same with 443
2019-02-24Merge branch 'trivial/remove-io-inspect-spam' into 'develop'kaniini
twitter card: remove IO.inspect() spam See merge request pleroma/pleroma!863
2019-02-24twitter card: remove IO.inspect() spamWilliam Pitcock
2019-02-24delegate user retrieval to the User module11backslashes
2019-02-23Merge branch 'add-apache-cache-config' into 'develop'kaniini
apache config: add instructions for mediaproxy. See merge request pleroma/pleroma!856
2019-02-23Merge branch 'card-handling' into 'develop'kaniini
Private card handling Closes #652 See merge request pleroma/pleroma!854
2019-02-23Merge branch 'fix/meck' into 'develop'kaniini
Update meck to fix tests on MacOS Closes #662 See merge request pleroma/pleroma!855
2019-02-23apache config: add instructions for mediaproxy.faried nawaz
2019-02-22Upate meck to fix tests on MacOSMark Felder