summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2018-02-12Merge branch 'develop' into feature/activitypublain
2018-02-12Make test output easier to read.lain
2018-02-12Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into developlain
2018-02-11ActivityPub: Basic note federation with Mastodon.lain
2018-02-11Twitter Representers: Handle Mastodon attachments.lain
2018-02-11Basic AP user building.Roger Braun
2018-02-11Merge branch 'develop' into feature/activitypubRoger Braun
2018-02-09print <link rel="next"> element in atom.feedhakabahitoyo
2018-02-09introduce max_id parameter in feed.atom (debug)Hakaba Hitoyo
2018-02-09UtilController: Fix statusnet config api compatibility.Roger Braun
2018-02-09introduce max_id parameter in feed.atomHakaba Hitoyo
2018-02-09Merge branch 'develop' into 'develop'lambda
action_fallback for OAuth Controller See merge request pleroma/pleroma!63
2018-02-08Merge branch 'fix/config-disable-chat' into 'develop'lambda
Add config option for enabling/disabling chat. See merge request pleroma/pleroma!58
2018-02-08Changed fallback controller to handle all cases from OAuthControllerCalv Collins
2018-02-08Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into developCalv Collins
2018-02-08Create action_fallback for username/password incorrect inputCalv Collins
2018-02-08Fix compile errors on 1.4.5Roger Braun
2018-02-04Detect file type if none given.eal
2018-02-03Merge branch 'move-backend-images' into 'develop'lambda
Move avi.png & banner.png from /priv/static/static to /priv/static/images See merge request pleroma/pleroma!60
2018-02-03add backend endpoint /imagesHakaba Hitoyo
2018-02-03move avi.png & banner.png from /priv/static/static to /priv/static/imagesHakaba Hitoyo
2018-02-03Add config option for enabling/disabling chat.eal
2018-02-02Add remote following of local profiles.eal
2018-02-01TwitterAPI: Add is_local to user view.eal
2018-01-31Merge branch 'feature/instance-thumbnail-api' into 'develop'eal
Provide instance thumbnail in /api/v1/instance See merge request pleroma/pleroma!55
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/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-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
Pr upstream http proxy See merge request pleroma/pleroma!43
2018-01-29Fix incoming Pleroma CWs. Closes #96.Roger Braun
2018-01-29use nil instead of empty stringJeff Becker
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-18Revert "Revert "Add remote follow pages.""eal
This reverts commit b259b4e4d1dc27528b99744fffabfb05c676ec3f.
2018-01-18Revert "Revert "Add remote follow path to webfinger.""eal
This reverts commit fb5aa34092cf8aa04b3b7001e81cf1585ee0041a.
2018-01-18Revert "Add remote follow pages."eal
This reverts commit 47e8c8db05dbe1f9d0ad7790be9ae9ed40f4e909.
2018-01-18Revert "Add remote follow path to webfinger."eal
This reverts commit bc689740f09ee8201982455988bf5f4ccb02fe57.
2018-01-18Add remote follow pages.eal
2018-01-18Add remote follow path to webfinger.eal
2018-01-16Fetch external profile in the background.eal
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-14Move user count to stats agent.eal
2018-01-13Add a stats agent for storing data from expensive queries.eal
2018-01-12Ask for proxy URL if proxy enabled.eal
Also change the true/false question to y/n