528 commits

Author	SHA1	Message	Date
eal	163c658202	TwitterAPI: Add unimplemented /mutes/users/ids.	2017-11-14 16:12:52 +02:00
eal	22bbe27115	TwitterAPI: Add unimplemented /friendships/no_retweets/ids.	2017-11-14 16:10:13 +02:00
eal	3533bf7eac	TwitterAPI: Add /friends/ids.	2017-11-14 16:04:58 +02:00
Roger Braun	083cd169d2	MastoAPI: Fix repeat api bug. ... Documentation was wrong, reblogging actually returns the reblog, not the reblogged status.	2017-11-13 09:48:56 +01:00
Roger Braun	5fc6e9d467	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2017-11-12 14:25:15 +01:00
Roger Braun	d293ceb1b5	Add Mastodon frontend.	2017-11-12 14:23:05 +01:00
lambda	08bc316742	Merge branch 'mastodon-notification-endpoints' into 'develop' ... MastoAPI: Add notification endpoints get, clear and dismiss. Closes #42 See merge request pleroma/pleroma!13	2017-11-12 11:08:06 +00:00
lambda	efcf54dc02	Merge branch 'mastoapi-update-credentials' into 'develop' ... MastoAPI: Add update credentials endpoint. Closes #61 See merge request pleroma/pleroma!15	2017-11-12 09:24:32 +00:00
eal	fc7483cb3c	MastoAPI: Add update credentials endpoint.	2017-11-12 00:27:09 +02:00
Roger Braun	414c52509b	MastoAPI: Websocket streaming for federated timeline.	2017-11-11 20:00:11 +01:00
Roger Braun	bd5bdc4c24	MastoAPI: Basic streaming.	2017-11-11 14:59:25 +01:00
Roger Braun	a1923d20e8	MastoAPI: Fix reblog emojis.	2017-11-11 11:18:05 +01:00
Roger Braun	fd12e585c9	Handle existing redirect params.	2017-11-10 18:24:50 +01:00
Roger Braun	1d3d66a841	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2017-11-10 17:37:54 +01:00
Roger Braun	6e9c22c0af	MastoAPI: Use string ids everywhere.	2017-11-10 17:18:19 +01:00
eal	e6a78c6ed0	MastoAPI: Add notification get, clear and dismiss.	2017-11-10 15:24:52 +02:00
Roger Braun	266d9c008d	MastoAPI: Fetch statuses in search.	2017-11-09 16:48:45 +01:00
Roger Braun	f1d27a5fbb	Add actor column to activities.	2017-11-09 10:41:19 +01:00
Roger Braun	41b8a76e96	Re-fetch user data on salmon decode error.	2017-11-09 08:32:54 +01:00
lambda	77e272df2d	Merge branch 'following-you-in-user-view' into 'develop' ... TwitterAPI user view: add follows_you. See merge request pleroma/pleroma!11	2017-11-08 17:57:13 +00:00
eal	f7fc048aeb	TwitterAPI user view: add follows_you.	2017-11-08 19:13:03 +02:00
Roger Braun	d2430d5007	Look through whole db for user timelines. ... They already have an index that's good enough.	2017-11-08 17:25:18 +01:00
eal	4656cb9b99	TwitterAPI user view: add blocks.	2017-11-08 13:02:00 +02:00
eal	6c0758e041	TwitterAPI: Add blocks.	2017-11-08 00:04:53 +02:00
lambda	be67db5547	Merge branch 'mastodon-emoji-endpoint' into 'develop' ... Add mastodon API endpoint for custom emoji. See merge request pleroma/pleroma!8	2017-11-07 20:01:15 +00:00
eal	c6210183e1	Add mastodon API endpoint for custom emoji.	2017-11-07 21:55:01 +02:00
lambda	d761b1543a	Merge branch 'authenticated-profile-fetching' into 'develop' ... Allow profile fetching for authenticated users only. Closes #54 See merge request pleroma/pleroma!7	2017-11-07 18:58:22 +00:00
Roger Braun	722c4614ad	Allow self-rt.	2017-11-07 16:45:27 +01:00
Roger Braun	6dfa62800a	Revert "Longer timeouts for user fetching." ... Breaks too many tests. This reverts commit 7de3a65214.	2017-11-07 09:41:35 +01:00
Roger Braun	7de3a65214	Longer timeouts for user fetching.	2017-11-07 09:11:19 +01:00
eal	f85566324e	Allow profile fetching for authenticated users only.	2017-11-07 00:33:44 +02:00
lambda	ed1eb5deea	Merge branch 'fix-tootdon-oauth' into 'develop' ... Fix tootdon logins. See merge request pleroma/pleroma!6	2017-11-06 20:27:31 +00:00
eal	b0e27b21dd	Fix tootdon logins.	2017-11-06 21:51:31 +02:00
Roger Braun	7252f6b054	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2017-11-05 12:12:19 +01:00
Roger Braun	046bee34d3	Fix bug when no posts are in the db.	2017-11-05 12:11:59 +01:00
lambda	fa1f11e8e9	Merge branch 'feature/blocks' into 'develop' ... Feature/blocks See merge request pleroma/pleroma!5	2017-11-03 08:56:44 +00:00
Roger Braun	c6b9b777da	MastoAPI: Add list of blocked users.	2017-11-03 08:51:17 +01:00
Roger Braun	5bf92e50be	MastoAPI: Add blocking.	2017-11-03 08:38:05 +01:00
Roger Braun	33beb51da4	MastoAPI: Add blocking to AccountView.	2017-11-03 08:23:31 +01:00
Roger Braun	8a1a7191fd	MastoAPI: Fix mentions always being for an anonymous user.	2017-11-03 08:13:39 +01:00
Roger Braun	9b63647aff	MastoApi: Add blocking to fetches.	2017-11-02 22:53:34 +01:00
Roger Braun	d89a7a0b34	TwitterAPI: Add blocking to fetches.	2017-11-02 22:50:42 +01:00
Roger Braun	867ac1e4f5	Handle nil cases.	2017-11-02 22:47:48 +01:00
Roger Braun	8ef58a266b	Don't return blocked users' activities in contexts.	2017-11-02 22:44:36 +01:00
Roger Braun	a47727adde	Don't return activities from blocked users.	2017-11-02 22:37:26 +01:00
Roger Braun	9be286a900	Handle empty terms / tags.	2017-11-01 09:33:29 +01:00
Roger Braun	6f05367325	Federate out content warnings.	2017-10-31 19:51:58 +01:00
Roger Braun	e014cc6ed8	Allow using cws in mastodon api.	2017-10-31 19:44:36 +01:00
Roger Braun	44295dd49a	MastoAPI: Include CW.	2017-10-31 17:49:47 +01:00
Roger Braun	04217f52c9	TwitterAPI: Display cws.	2017-10-31 17:43:37 +01:00