Commit graph

5834 commits

Author SHA1 Message Date
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
5a3be8ad1b Merge branch 'dtluna/pleroma-bugfix/deny-empty-posts' into develop 2017-04-25 12:01:00 +02:00
Roger Braun
a25adfbfee Remove superflous function. 2017-04-25 11:33:32 +02:00
Roger Braun
6529cab982 Merge branch 'develop' into dtluna/pleroma-bugfix/deny-empty-posts 2017-04-25 11:09:14 +02:00
Roger Braun
ab0114fbaa Return salmon path for users, basic incoming salmon handling. 2017-04-24 18:46:34 +02:00
Roger Braun
34d3aea92f Add incoming xml fixtures. 2017-04-24 18:46:02 +02:00
lambadalambda
aef7e943e7 Merge branch 'bugfix/ascii-alphanumeric-names' into 'develop'
Add restriction on names

Closes #15

See merge request !15
2017-04-24 09:59:44 -04:00
dtluna
668b01da0b Add restriction on names 2017-04-24 15:34:54 +03: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
Roger Braun
43d7a4b2cf Add basic fields to support remote users. 2017-04-24 08:49:09 +02: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
Roger Braun
7424310e14 Basic key fetching. 2017-04-23 16:35:17 +02: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
4c216cba9c Decode and verify salmons. 2017-04-23 15:21:58 +02:00
Roger Braun
8a07ddef8f Don't break feed if user has no posts. 2017-04-23 10:38:24 +02:00
Roger Braun
4649ba2d62 Merge branch 'ostatus' into develop 2017-04-23 10:37:29 +02:00
Roger Braun
361a8c4219 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop 2017-04-23 10:37:22 +02:00
Roger Braun
cef4a4d709 Fix utf8 problems with iolists. 2017-04-22 15:34:29 +02:00
Roger Braun
04fb4f9c47 Add poco data to user. 2017-04-22 15:11:13 +02:00
Roger Braun
923584d046 Remove unknown activities from feed. 2017-04-22 14:37:54 +02:00
Roger Braun
c585f9e26c Only handle subscription requests for now. 2017-04-22 13:48:10 +02:00
Roger Braun
8fb73c28bb Only have one subscription per callback. 2017-04-22 13:44:21 +02:00
Roger Braun
1feb193731 Add rel=self link too feed. 2017-04-22 12:11:36 +02:00
Roger Braun
ece85fc8bc Add attachments to feed. 2017-04-22 12:09:13 +02: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
Roger Braun
77cb260628 add basic federation to websub. 2017-04-22 12:07:51 +02:00
Roger Braun
39dc74f967 Add callback to websub subscription. 2017-04-22 12:05:48 +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
f51a672ac4 Return object id in Ostatus create activties. 2017-04-21 04:22:02 +02:00
Roger Braun
424e0e7779 Add Websub verification. 2017-04-21 03:59:11 +02: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
lambadalambda
e987be2de7 Merge branch 'bugfix/mentions-timeline' into 'develop'
Mentions timeline bugfix

See merge request !11
2017-04-21 05:17:25 -04:00
dtluna
7a018a8d3b Add /statuses/mentions_timeline route 2017-04-21 00:29:08 +03:00
Roger Braun
1b9cc721a0 Websub controller beginnings. 2017-04-20 17:47:33 +02:00
lambadalambda
27c53242a3 Merge branch 'feature/mentions-timeline' into 'develop'
Add statuses/mentions endpoint

Closes #2

See merge request !10
2017-04-20 10:21:16 -04:00
dtluna
3a56d7318f Add statuses/mentions endpoint 2017-04-20 15:18:54 +03:00
Roger Braun
5e7ceeba94 Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus 2017-04-20 10:16:41 +02:00
Roger Braun
cc330421fd Better activities in ostatus. 2017-04-20 10:16:06 +02: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
Roger Braun
9167a2ebe3 Send frontend through phoenix. 2017-04-19 15:25:18 +02:00