aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-01-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun
2018-01-29Fix incoming Pleroma CWs. Closes #96.Roger Braun
2018-01-29use nil instead of empty stringJeff Becker
2018-01-27Merge branch 'feature/longfox' into 'develop'lambda
2018-01-27add longfox emojisHakaba Hitoyo
2018-01-26Merge branch 'feature/cross-origin' into 'develop'lambda
2018-01-26Access-Control-Allow-OriginHakaba Hitoyo
2018-01-26Update frontend.Roger Braun
2018-01-26Fix config.Roger Braun
2018-01-26Update frontend.Roger Braun
2018-01-24Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxyJeff Becker
2018-01-20Stats: Make less crashy and improve query.Roger Braun
2018-01-20Merge branch 'feature/remote-follow' into 'develop'lambda
2018-01-18Revert "Revert "Add remote follow pages.""eal
2018-01-18Revert "Revert "Add remote follow path to webfinger.""eal
2018-01-18Revert "Add remote follow pages."eal
2018-01-18Revert "Add remote follow path to webfinger."eal
2018-01-18Add remote follow pages.eal
2018-01-18Add remote follow path to webfinger.eal
2018-01-16Merge branch 'fix/background-profile-fetch' into 'develop'lambda
2018-01-16Add a Caddyfile.eal
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