Commit Graph

117 Commits

Author SHA1 Message Date
Roger Braun
71362acb93 Quick fix for database filling. 2017-05-09 00:20:05 +02:00
Roger Braun
1418d72749 Add class=attachment to attachment links. 2017-05-08 20:12:36 +02:00
Roger Braun
b9da7d3219 typo. 2017-05-07 20:30:34 +02:00
Roger Braun
7303786160 Add some twapi fixes. 2017-05-07 20:20:53 +02:00
Roger Braun
b403ea4d2b Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity 2017-05-07 19:28:23 +02:00
Roger Braun
a41aa4e489 Federate follow salmons. 2017-05-07 14:45:37 +02:00
Roger Braun
95ab0dc3c5 Add conversation ids to twapi announce representer. 2017-05-07 12:46:21 +02:00
Roger Braun
7269c51f3a Some refactoring. 2017-05-05 12:07:38 +02:00
Roger Braun
c48c381e90 Merge branch 'develop' into dtluna/pleroma-refactor/1 2017-05-05 11:46:59 +02:00
Roger Braun
33c803d6da Add attachment link to posts. 2017-05-02 18:25:39 +02:00
Roger Braun
16f8406eb6 Add statusnet_profile_url to the TwAPI. 2017-05-02 14:36:04 +02:00
Roger Braun
32a95d73da Add twkn timeline. 2017-05-02 14:12:43 +02:00
Roger Braun
3cb518270a Remove superfluous transaction. 2017-05-01 16:15:21 +02:00
Roger Braun
f169de3454 Cache objects in dev and prod. 2017-05-01 16:12:20 +02:00
Roger Braun
09f7ed4214 Don't set statusnetConversationIds on replies anymore. 2017-04-30 14:26:29 +02:00
Roger Braun
379caca01d Wrap context creation in transaction. 2017-04-30 13:58:40 +02:00
Roger Braun
4c8111c334 Use conversation mapping objects to get / retrieve context from TwAPI. 2017-04-30 13:53:26 +02:00
Roger Braun
ffc604a2c2 Use cache for user info data.
Later these should be persisted in the user.
2017-04-30 10:04:54 +02:00
dtluna
a9b2ad1759 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity 2017-04-28 16:06:57 +03:00
dtluna
6cf7c13228 Refactor code to comply with credo suggestions 2017-04-27 16:18:50 +03:00
Roger Braun
e8882ab3da Merge branch 'develop' into feature/incoming_ostatus 2017-04-26 09:18:49 +02:00
dtluna
c3655d1c47 Remove unnecessary status_update definition 2017-04-25 19:47:16 +03:00
Roger Braun
b438ea24ee Add ostatus conversation as context. 2017-04-25 17:45:34 +02:00
Roger Braun
6c5f5e18ec Even more refactoring. 2017-04-25 17:36:53 +02:00
Roger Braun
4771962a5d More refactoring. 2017-04-25 17:32:36 +02:00
Roger Braun
ef4190b3ab Clean up status create method. 2017-04-25 17:26:05 +02:00
Roger Braun
ab0114fbaa Return salmon path for users, basic incoming salmon handling. 2017-04-24 18:46:34 +02:00
dtluna
42105497ca Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats 2017-04-24 14:17:23 +03:00
dtluna
5b6070ec40 Deny whitespace statuses 2017-04-24 12:09:11 +03:00
dtluna
f723b23691 Add error response to self-repeats 2017-04-24 01:11:38 +03:00
dtluna
6b6bc9435c Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats 2017-04-24 01:05:02 +03:00
dtluna
1e3791877c Add error response on empty status 2017-04-23 19:08:25 +03:00
lambadalambda
a3b9741a62 Merge branch 'feature/follow-unfollow-by-screen-name' into 'develop'
Follow and unfollow using screen_name

See merge request !9
2017-04-23 10:26:27 -04:00
Roger Braun
a2b79ce7d1 Add outgoin federation to twitter api.
Doesn't really belong there, find a different place for it. Should
federate on every activity insertion.
2017-04-22 12:08:20 +02:00
dtluna
28b203d08f Add Undo of Follow Activity insertion 2017-04-21 19:54:21 +03:00
Roger Braun
1c00eb4a90 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus 2017-04-21 18:42:28 +02:00
dtluna
a9b3f99d48 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name 2017-04-21 18:36:03 +03:00
Roger Braun
9afc672009 Quick fix for activities without 'to'. 2017-04-21 01:01:58 +02:00
Roger Braun
1e88f102c4 Fix specs, add some user info. 2017-04-21 00:51:09 +02:00
dtluna
3a56d7318f Add statuses/mentions endpoint 2017-04-20 15:18:54 +03:00
dtluna
b248fc7dfb Refactor unfollow/2 2017-04-20 10:57:37 +03:00
dtluna
01901d9835 Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name 2017-04-20 10:46:27 +03:00
dtluna
d952b6cd7b Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name 2017-04-20 10:39:18 +03:00
lambadalambda
eda742c78b Merge branch 'feature/user-timeline' into 'develop'
Feature/user timeline

See merge request !8
2017-04-19 05:50:24 -04:00
Roger Braun
36e883cd4b Add basic Ostatus user representer. 2017-04-17 14:12:36 +02:00
lambadalambda
ac9817bdb0 Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'
Add error messages for repeated follows and unfollows

See merge request !7
2017-04-17 05:46:59 -04:00
dtluna
ef5033d7a7 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow 2017-04-16 17:18:34 +03:00
dtluna
f6547f7b7f Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name 2017-04-16 17:13:42 +03:00
dtluna
82914e1e4d Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name 2017-04-16 17:12:28 +03:00
dtluna
85bd480be3 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test 2017-04-16 17:10:25 +03:00