aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-01-16Fetch external profile in the background.eal
2018-01-15Merge branch 'default-pictures' into 'develop'eal
2018-01-15Add a default profile picture and banner.eal
2018-01-15Merge branch 'prod.exs' into 'develop'eal
2018-01-15Merge branch 'fix/pleroma.nginx' into 'develop'eal
2018-01-15Merge branch 'stats-daemon' into 'develop'lambda
2018-01-14Correct pleroma.nginxHakaba Hitoyo
2018-01-14#95 Correct prod.exsHakaba Hitoyo
2018-01-14Fix instance test.eal
2018-01-14Move user count to stats agent.eal
2018-01-13Add a stats agent for storing data from expensive queries.eal
2018-01-12Merge branch 'add-mediaproxy-question-to-configgen' into 'develop'eal
2018-01-12Ask for proxy URL if proxy enabled.eal
2018-01-09added question about activating mediaproxy to config generatorSebastian Huebner
2017-12-31apply proxy settings to media_proxyJeff Becker
2017-12-30clarifyJeff Becker
2017-12-30docsJeff Becker
2017-12-30make httppoison use configurable http proxyJeff Becker
2017-12-23Unlink follow import process from the one processing request.eal
2017-12-22Merge branch 'media-proxy-fix-encoding' into 'develop'lambda
2017-12-21Remove a useless URI.encode call in MediaProxyhref
2017-12-20Merge branch 'media-proxy' into 'develop'lambda
2017-12-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developLain Iwakura
2017-12-19Fix timelines in subway tooter.Lain Iwakura
2017-12-18Merge branch 'fix/twitterapi-follow-lists' into 'develop'lambda
2017-12-18MastoAPI: Fix always-sensitive bugs.Lain Iwakura
2017-12-18Send out salmons before websub.Lain Iwakura
2017-12-18Fix follower/following lists.eal
2017-12-18Merge branch 'feature/follow-import' into 'develop'lambda
2017-12-12Run follow import in the background.eal
2017-12-12Allow uploading a file for follow import.eal
2017-12-12Add follow import.eal
2017-12-12proxy emojishref
2017-12-12fix content-type and fallback to image/jpeghref
2017-12-11Fix some more tests.eal
2017-12-11Fix tests.eal
2017-12-11Merge branch 'fix/tootdon-mentions' into 'develop'lambda
2017-12-11Add a bunch of useless HTML to mentions.eal
2017-12-11Merge remote-tracking branch 'upstream/develop' into media-proxyhref
2017-12-11nginx sample config, quickly testedhref
2017-12-11Limit body size to 25MBhref
2017-12-09Merge branch 'feature/user_deletion' into developRoger Braun
2017-12-08Delete notifications on activity deletion.Lain Iwakura
2017-12-08Basic user deletion.Lain Iwakura
2017-12-08Merge branch 'fix/linkify' into 'develop'lambda
2017-12-08Merge branch 'fix/mastoapi-attachment-linking' into 'develop'lambda
2017-12-08Merge branch 'postgresetup' into 'develop'lambda
2017-12-07Allow parentheses in links.eal
2017-12-07Fix HTML escape breaking some links.eal
2017-12-07MastoAPI: don't add attachment links.eal