summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-01-15Merge branch 'default-pictures' into 'develop'eal
Add a default profile picture and banner. See merge request pleroma/pleroma!48
2018-01-15Add a default profile picture and banner.eal
This removes the placehold.it dependency.
2018-01-15Merge branch 'prod.exs' into 'develop'eal
Correct prod.exs See merge request pleroma/pleroma!47
2018-01-15Merge branch 'fix/pleroma.nginx' into 'develop'eal
Correct pleroma.nginx See merge request pleroma/pleroma!46
2018-01-15Merge branch 'stats-daemon' into 'develop'lambda
Add a stats agent for storing data from expensive queries. See merge request pleroma/pleroma!45
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
added question about activating mediaproxy to config generator See merge request pleroma/pleroma!44
2018-01-12Ask for proxy URL if proxy enabled.eal
Also change the true/false question to y/n
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
Mistakes were made.
2017-12-22Merge branch 'media-proxy-fix-encoding' into 'develop'lambda
Remove a useless URI.encode call in MediaProxy See merge request pleroma/pleroma!42
2017-12-21Remove a useless URI.encode call in MediaProxyhref
2017-12-20Merge branch 'media-proxy' into 'develop'lambda
Media proxy See merge request pleroma/pleroma!34
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
Fix follower/following lists. Closes #29 See merge request pleroma/pleroma!41
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
Add tests.
2017-12-18Merge branch 'feature/follow-import' into 'develop'lambda
Add follow import. See merge request pleroma/pleroma!40
2017-12-12Run follow import in the background.eal
2017-12-12Allow uploading a file for follow import.eal
2017-12-12Add recipients field to activities.Lain Iwakura
Also do some very basic checks for AP message insertion.
2017-12-12Add follow import.eal
2017-12-12proxy emojishref
(i fix emojos better than gargon but sshhhhh)
2017-12-12fix content-type and fallback to image/jpeghref
2017-12-12ActivityPub: Check inbox requests for valid signature.Roger Braun
2017-12-12Add plug to validate signed http requests.Roger Braun
2017-12-11Fix some more tests.eal
2017-12-11ActivityPub: Add controller tests.Lain Iwakura
2017-12-11ActivityPub: Add object routes / controller.Lain Iwakura
2017-12-11ActivityPub: Use only string keys in views.Lain Iwakura
2017-12-11ActivityPub: Add Objects View.Lain Iwakura
2017-12-11Fix tests.eal
2017-12-11Merge branch 'fix/tootdon-mentions' into 'develop'lambda
Fix Tootdon linking the whole status when mentioning someone. See merge request pleroma/pleroma!39
2017-12-11Add a bunch of useless HTML to mentions.eal
2017-12-11HTTPSig: Add method to validate connRoger Braun
2017-12-11Basic incoming AP support.Roger Braun
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-09Add link to AP address in webfinger.Roger Braun
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 04:31:54 +0000