| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-01-30 | Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop | Roger Braun | |
| 2018-01-30 | Make specs less breaky. | Roger Braun | |
| 2018-01-30 | Fix specs. | Roger Braun | |
| 2018-01-30 | provide logo at feed.atom (debug) | Hakaba Hitoyo | |
| 2018-01-30 | provide logo at feed.atom | Hakaba Hitoyo | |
| 2018-01-30 | Merge branch 'pr-upstream-http-proxy' into 'develop' | lambda | |
| Pr upstream http proxy See merge request pleroma/pleroma!43 | |||
| 2018-01-30 | Merge branch 'feature/caddyfile' into 'develop' | lambda | |
| Add a Caddyfile. See merge request pleroma/pleroma!50 | |||
| 2018-01-29 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | Roger Braun | |
| 2018-01-29 | Fix incoming Pleroma CWs. Closes #96. | Roger Braun | |
| 2018-01-29 | use nil instead of empty string | Jeff Becker | |
| 2018-01-27 | Merge branch 'feature/longfox' into 'develop' | lambda | |
| add longfox emojis See merge request pleroma/pleroma!53 | |||
| 2018-01-27 | add longfox emojis | Hakaba Hitoyo | |
| 2018-01-26 | Merge branch 'feature/cross-origin' into 'develop' | lambda | |
| Access-Control-Allow-Origin See merge request pleroma/pleroma!52 | |||
| 2018-01-26 | Access-Control-Allow-Origin | Hakaba Hitoyo | |
| 2018-01-26 | Update frontend. | Roger Braun | |
| 2018-01-26 | Fix config. | Roger Braun | |
| 2018-01-26 | Update frontend. | Roger Braun | |
| 2018-01-24 | Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy | Jeff Becker | |
| 2018-01-20 | Stats: Make less crashy and improve query. | Roger Braun | |
| 2018-01-20 | Merge branch 'feature/remote-follow' into 'develop' | lambda | |
| remote follow See merge request pleroma/pleroma!51 | |||
| 2018-01-18 | Revert "Revert "Add remote follow pages."" | eal | |
| This reverts commit b259b4e4d1dc27528b99744fffabfb05c676ec3f. | |||
| 2018-01-18 | Revert "Revert "Add remote follow path to webfinger."" | eal | |
| This reverts commit fb5aa34092cf8aa04b3b7001e81cf1585ee0041a. | |||
| 2018-01-18 | Revert "Add remote follow pages." | eal | |
| This reverts commit 47e8c8db05dbe1f9d0ad7790be9ae9ed40f4e909. | |||
| 2018-01-18 | Revert "Add remote follow path to webfinger." | eal | |
| This reverts commit bc689740f09ee8201982455988bf5f4ccb02fe57. | |||
| 2018-01-18 | Add remote follow pages. | eal | |
| 2018-01-18 | Add remote follow path to webfinger. | eal | |
| 2018-01-16 | Merge branch 'fix/background-profile-fetch' into 'develop' | lambda | |
| Fetch external profile in the background. See merge request pleroma/pleroma!49 | |||
| 2018-01-16 | Add a Caddyfile. | eal | |
| 2018-01-16 | Fetch external profile in the background. | eal | |
| 2018-01-15 | Merge branch 'default-pictures' into 'develop' | eal | |
| Add a default profile picture and banner. See merge request pleroma/pleroma!48 | |||
| 2018-01-15 | Add a default profile picture and banner. | eal | |
| This removes the placehold.it dependency. | |||
| 2018-01-15 | Merge branch 'prod.exs' into 'develop' | eal | |
| Correct prod.exs See merge request pleroma/pleroma!47 | |||
| 2018-01-15 | Merge branch 'fix/pleroma.nginx' into 'develop' | eal | |
| Correct pleroma.nginx See merge request pleroma/pleroma!46 | |||
| 2018-01-15 | Merge branch 'stats-daemon' into 'develop' | lambda | |
| Add a stats agent for storing data from expensive queries. See merge request pleroma/pleroma!45 | |||
| 2018-01-14 | Correct pleroma.nginx | Hakaba Hitoyo | |
| 2018-01-14 | #95 Correct prod.exs | Hakaba Hitoyo | |
| 2018-01-14 | Fix instance test. | eal | |
| 2018-01-14 | Move user count to stats agent. | eal | |
| 2018-01-13 | Add a stats agent for storing data from expensive queries. | eal | |
| 2018-01-12 | Merge 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-12 | Ask for proxy URL if proxy enabled. | eal | |
| Also change the true/false question to y/n | |||
| 2018-01-09 | added question about activating mediaproxy to config generator | Sebastian Huebner | |
| 2017-12-31 | apply proxy settings to media_proxy | Jeff Becker | |
| 2017-12-30 | clarify | Jeff Becker | |
| 2017-12-30 | docs | Jeff Becker | |
| 2017-12-30 | make httppoison use configurable http proxy | Jeff Becker | |
| 2017-12-23 | Unlink follow import process from the one processing request. | eal | |
| Mistakes were made. | |||
| 2017-12-22 | Merge branch 'media-proxy-fix-encoding' into 'develop' | lambda | |
| Remove a useless URI.encode call in MediaProxy See merge request pleroma/pleroma!42 | |||
| 2017-12-21 | Remove a useless URI.encode call in MediaProxy | href | |
| 2017-12-20 | Merge branch 'media-proxy' into 'develop' | lambda | |
| Media proxy See merge request pleroma/pleroma!34 | |||
 |
index : pleroma | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiff |