Age | Commit message (Collapse) | Author | |
---|---|---|---|
2018-02-03 | move avi.png & banner.png from /priv/static/static to /priv/static/images | Hakaba Hitoyo | |
2018-02-03 | Add config option for enabling/disabling chat. | eal | |
2018-02-02 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | Roger Braun | |
2018-02-02 | Update frontend. | Roger Braun | |
2018-02-02 | Merge branch 'feature/remote-follow' into 'develop' | lambda | |
Add remote following of local profiles. See merge request pleroma/pleroma!59 | |||
2018-02-02 | Add remote following of local profiles. | eal | |
2018-02-01 | TwitterAPI: Add is_local to user view. | eal | |
2018-01-31 | Revert renaming emoji.txt | eal | |
2018-01-31 | Merge branch 'feature/instance-thumbnail-api' into 'develop' | eal | |
Provide instance thumbnail in /api/v1/instance See merge request pleroma/pleroma!55 | |||
2018-01-31 | Merge branch 'fix/split-custom-emoji' into 'develop' | lambda | |
Split emoji to default and custom. See merge request pleroma/pleroma!56 | |||
2018-01-31 | Split emoji to default and custom. | eal | |
2018-01-31 | provide instance thumbnail at /api/v1/instance (debug) | Hakaba Hitoyo | |
2018-01-31 | provide instance thumbnail at /api/v1/instance (debug) | Hakaba Hitoyo | |
2018-01-31 | provide instance thumbnail at /api/v1/instance (debug) | Hakaba Hitoyo | |
2018-01-31 | provide instance thumbnail at /api/v1/instance | Hakaba Hitoyo | |
2018-01-30 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | Roger Braun | |
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 |