summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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
2019-02-22Move visibility into own module.lain
2019-02-22Merge branch 'oauth2_scopes_migration_hotfix' into 'develop'href
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope` Closes #660 See merge request pleroma/pleroma!853
2019-02-22Fix private post card handling.lain
2019-02-22Fixed `scopes` of apps / authorizations / tokens from apps initially created ↵Ivan Tashkinov
with space-delimited `scope`.
2019-02-22Merge branch 'fix/twittercards' into 'develop'kaniini
Fix Twitter Cards See merge request pleroma/pleroma!815
2019-02-22Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop'kaniini
Fix: Fixing an outbox related bug when local user activity is empty See merge request pleroma/pleroma!849
2019-02-22Fix: Fixing an outbox related bug when local user activity is emptyKZ
2019-02-21Merge branch 'bugfix/httpsig-sign-date' into 'develop'lambda
activitypub: sign date header Closes #649 and #364 See merge request pleroma/pleroma!847
2019-02-21Merge branch 'bugfix/as2-accept-json' into 'develop'lambda
accept application/json mimetype for fetching AS2 objects See merge request pleroma/pleroma!846
2019-02-21Merge branch '2019-02-21-update-frontend' into 'develop'lambda
update frontend See merge request pleroma/pleroma!850
2019-02-21update frontendlain
2019-02-21activitypub: sign http date headerWilliam Pitcock
2019-02-21mix: add timex dependencyWilliam Pitcock
2019-02-20tests: fix formattingWilliam Pitcock
2019-02-20fix fetching AP objects with application/jsonWilliam Pitcock
2019-02-20tests: add test for fetching AP objects with application/json.William Pitcock
2019-02-20Merge branch 'feature/improve-error-logging' into 'develop'lambda
logging: improve visibility into ISE errors See merge request pleroma/pleroma!845
2019-02-20logging: only return ISE reasons in API responses when in dev or test modeWilliam Pitcock
2019-02-20tests: fix testsWilliam Pitcock
2019-02-20logging: improve visibility into ISE errorsWilliam Pitcock
2019-02-20Merge branch 'feature/reports' into 'develop'kaniini
Reports Closes #83 See merge request pleroma/pleroma!701
2019-02-20ReportsEgor
2019-02-20Merge branch 'nicer-share-urls' into 'develop'kaniini
Add some nicer urls in status view. See merge request pleroma/pleroma!844
2019-02-20Add some nicer urls in status view.lain
2019-02-20Merge branch '468_oauth2_scopes' into 'develop'lambda
[#468] OAuth2 scopes Closes #468 See merge request pleroma/pleroma!799
2019-02-20[#468] Added support for `push` OAuth scope (Mastodon 2.4+).Ivan Tashkinov
2019-02-20[#468] Merged `upstream/develop`.Ivan Tashkinov
2019-02-20Merge branch 'muting' into 'develop'lambda
Implement muting, add it to the whole mastodon API See merge request pleroma/pleroma!319
2019-02-20Add test for User.mutes and so on.lain
2019-02-20Add test for muting functionality.lain
2019-02-20Remove superfluous migration.lain
2019-02-20[#468] Adjusted scope restriction for MastodonAPIController#index.Ivan Tashkinov
2019-02-20[#468] More OAuth scopes-specific tests.Ivan Tashkinov
2019-02-19Merge branch 'set-activation-status-admin-api' into 'develop'kaniini
Added admin API for changing user activation status See merge request pleroma/pleroma!843