summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-02-27Add follow request test.lain
2019-02-27Merge branch 'fix/formatter' into 'develop'kaniini
2019-02-27fix formatterEgor Kislitsyn
2019-02-27Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'kaniini
2019-02-27Add missing docs and testsMaxim Filippov
2019-02-26Merge branch 'auto_linker' into 'develop'kaniini
2019-02-26AutoLinkerEgor
2019-02-26Merge branch 'feature/more-actions-to-admin-api' into 'develop'kaniini
2019-02-27Add more admin actionsMaxim Filippov
2019-02-26Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'kaniini
2019-02-26need to put back ipv4 listen instructKenneth Zhao
2019-02-26Merge branch 'nginx-cfg' into 'develop'Haelwenn
2019-02-25Add ipv6 handling to pleroma.nginxPEA
2019-02-24Merge branch 'trivial/remove-io-inspect-spam' into 'develop'kaniini
2019-02-24twitter card: remove IO.inspect() spamWilliam Pitcock
2019-02-23Merge branch 'add-apache-cache-config' into 'develop'kaniini
2019-02-23Merge branch 'card-handling' into 'develop'kaniini
2019-02-23Merge branch 'fix/meck' into 'develop'kaniini
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
2019-02-22Fix private post card handling.lain
2019-02-22Fixed `scopes` of apps / authorizations / tokens from apps initially created ...Ivan Tashkinov
2019-02-22Merge branch 'fix/twittercards' into 'develop'kaniini
2019-02-22Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop'kaniini
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
2019-02-21Merge branch 'bugfix/as2-accept-json' into 'develop'lambda
2019-02-21Merge branch '2019-02-21-update-frontend' into 'develop'lambda
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
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
2019-02-20ReportsEgor
2019-02-20Merge branch 'nicer-share-urls' into 'develop'kaniini
2019-02-20Add some nicer urls in status view.lain
2019-02-20Merge branch '468_oauth2_scopes' into 'develop'lambda
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
2019-02-20Add test for User.mutes and so on.lain
2019-02-20Add test for muting functionality.lain