137 commits

Author	SHA1	Message	Date
Roger Braun	9e9d95ec99	Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus	2017-04-26 19:17:51 +02:00
Roger Braun	7561158ab1	Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus	2017-04-26 18:34:14 +02:00
Roger Braun	c5fa682c31	Refactor, add beginnings of websub client subscriptions.	2017-04-26 18:33:10 +02:00
Roger Braun	57bd59e407	Salmon creation.	2017-04-26 14:25:44 +02:00
Roger Braun	f1ebf812ee	Add inReplyTo to incoming messages.	2017-04-26 10:22:51 +02:00
Roger Braun	d9ebd785ab	Ostatus doesn't distinguish between activities / objects on create.	2017-04-26 10:08:13 +02:00
Roger Braun	e8882ab3da	Merge branch 'develop' into feature/incoming_ostatus	2017-04-26 09:18:49 +02:00
Roger Braun	22e936372e	Fix retweet spec.	2017-04-26 08:55:00 +02:00
Roger Braun	2f0e13abe2	Merge branch 'develop' into dtluna/pleroma-bugfix/deny-self-repeats	2017-04-26 08:49:26 +02:00
Roger Braun	b91ccef237	Output conversation id.	2017-04-26 08:47:22 +02:00
Roger Braun	f980f6778b	Wire up mentions.	2017-04-25 18:03:14 +02:00
Roger Braun	b438ea24ee	Add ostatus conversation as context.	2017-04-25 17:45:34 +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
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	4c216cba9c	Decode and verify salmons.	2017-04-23 15:21:58 +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	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
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	1e88f102c4	Fix specs, add some user info.	2017-04-21 00:51:09 +02:00
Roger Braun	1b9cc721a0	Websub controller beginnings.	2017-04-20 17:47:33 +02:00
dtluna	3a56d7318f	Add statuses/mentions endpoint	2017-04-20 15:18:54 +03:00
Roger Braun	cc330421fd	Better activities in ostatus.	2017-04-20 10:16:06 +02: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	d23f3e3cf3	Add webfinger and basic feed support.	2017-04-18 18:41:51 +02:00
dtluna	470f5f7cd6	Add user timeline spec test	2017-04-17 16:31:19 +03:00
Roger Braun	36e883cd4b	Add basic Ostatus user representer.	2017-04-17 14:12:36 +02:00
Roger Braun	ce6cc84a4a	Add basic webfinger.	2017-04-17 13:44:41 +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
Roger Braun	6a0e69a8a3	Fix syntax error.	2017-04-17 11:43:44 +02:00
Roger Braun	a185ea63af	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop	2017-04-17 11:37:21 +02:00
Roger Braun	6bfd521974	Switch cache implementation for size limiting.	2017-04-17 11:36:17 +02:00
dtluna	369be708b2	Remove unnecesary queries	2017-04-16 17:42:15 +03:00
dtluna	f6e632d25b	Remove unnecesary asserts	2017-04-16 17:39:34 +03:00