aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-02-03move avi.png & banner.png from /priv/static/static to /priv/static/imagesHakaba Hitoyo
2018-01-31Revert renaming emoji.txteal
2018-01-31Merge branch 'feature/instance-thumbnail-api' into 'develop'eal
2018-01-31Merge branch 'fix/split-custom-emoji' into 'develop'lambda
2018-01-31Split emoji to default and custom.eal
2018-01-31provide instance thumbnail at /api/v1/instance (debug)Hakaba Hitoyo
2018-01-31provide instance thumbnail at /api/v1/instance (debug)Hakaba Hitoyo
2018-01-31provide instance thumbnail at /api/v1/instance (debug)Hakaba Hitoyo
2018-01-31provide instance thumbnail at /api/v1/instanceHakaba Hitoyo
2018-01-30Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun
2018-01-30Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into developRoger Braun
2018-01-30Make specs less breaky.Roger Braun
2018-01-30Fix specs.Roger Braun
2018-01-30provide logo at feed.atom (debug)Hakaba Hitoyo
2018-01-30provide logo at feed.atomHakaba Hitoyo
2018-01-30Merge branch 'pr-upstream-http-proxy' into 'develop'lambda
2018-01-30Merge branch 'feature/caddyfile' into 'develop'lambda
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