Commit Graph

7 Commits

Author SHA1 Message Date
Roger Braun 361a8c4219 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-04-23 10:37:22 +02:00
Roger Braun 1e88f102c4 Fix specs, add some user info. 2017-04-21 00:51:09 +02:00
Roger Braun 36e883cd4b Add basic Ostatus user representer. 2017-04-17 14:12:36 +02:00
Roger Braun 03a9c11d25 Display the users avatar if he has one set. 2017-04-16 15:40:50 +02:00
Roger Braun e25aea3fa7 Add conversation id to activities.
This is for compatibility with the TwAPI.
2017-03-28 14:40:09 +02:00
Roger Braun 9ad045fd58 Return user specific json for logged in users. 2017-03-23 15:51:34 +01:00
Roger Braun 980717fdce Add Twitter API user representer. 2017-03-20 21:30:18 +01:00