| 
								
								
									 csaurus | 2ce48c1a42 | Formatting | 2018-05-13 15:36:41 -04:00 |  | 
				
					
						| 
								
								
									 csaurus | 9aabff4883 | Fix tests. | 2018-05-13 15:33:59 -04:00 |  | 
				
					
						| 
								
								
									 csaurus | c8d418acdd | api/v1/timelines/direct implementation | 2018-05-12 21:50:59 -04:00 |  | 
				
					
						| 
								
								
									 csaurus | c60a5405db | Detect and try to stream incoming "direct" messages | 2018-05-12 17:40:59 -04:00 |  | 
				
					
						| 
								
								
									 lambda | 6c2903d9a1 | Merge branch 'feld-warnings' into 'develop' Clean up warnings
See merge request pleroma/pleroma!144 | 2018-05-06 18:42:31 +00:00 |  | 
				
					
						| 
								
								
									 eal | bfad57c7c9 | Get rid of unsafe variables. | 2018-05-06 09:58:59 +03:00 |  | 
				
					
						| 
								
								
									 lain | 96add86b50 | Unify wss uri generation. | 2018-05-05 13:40:31 +02:00 |  | 
				
					
						| 
								
								
									 lain | c464355d1a | Idempotency: Use special cache, keep for 6 hours. | 2018-05-05 11:15:57 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 31ea9cbcd8 | Group def renders together to fix warning | 2018-05-04 22:28:13 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | aaacebd906 | Fix unused variables, imports, and aliases | 2018-05-04 21:42:20 +00:00 |  | 
				
					
						| 
								
								
									 lain | 90c4bed0af | Don't expire idempotency cache for five minutes. | 2018-05-04 21:15:39 +02:00 |  | 
				
					
						| 
								
								
									 lain | fcd3eca167 | MastodonAPI: Support idempotency key. | 2018-05-04 20:30:29 +02:00 |  | 
				
					
						| 
								
								
									 lain | ff5e957476 | Make search use id index too. Seems to be faster in general, query planner chooses well. | 2018-04-21 09:22:31 +02:00 |  | 
				
					
						| 
								
								
									 lain | a61e8ac154 | Formatting. | 2018-04-20 13:10:57 +02:00 |  | 
				
					
						| 
								
								
									 eal | 947431e9aa | MastoAPI and OAuth: allow login with either email or username. | 2018-04-18 13:13:57 +03:00 |  | 
				
					
						| 
								
								
									 Gian Sass | 907df9b8ed | Fix issue #124 | 2018-04-11 14:55:49 -04:00 |  | 
				
					
						| 
								
								
									 lain | 1dd2c8163f | Order masto searches by date. | 2018-04-10 18:38:52 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 9998b4519d | Merge branch 'feature/mastodon-api-for-tootstream' into 'develop' mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100 | 2018-04-08 06:02:11 +00:00 |  | 
				
					
						| 
								
								
									 lambda | 9a2d3705c6 | Merge branch 'fix/persisted-mastofe-settings' into 'develop' MastoAPI: Persist frontend timelines and settings.
Closes #113
See merge request pleroma/pleroma!98 | 2018-04-08 06:01:06 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 1857f403be | mastodon api: report version as the Mastodon API version supported with the real version in parenthesis | 2018-04-07 17:29:28 -05:00 |  | 
				
					
						| 
								
								
									 lain | 70bcdf32bd | Only search in public data for now. This should be the data the user is allowed to see later, but this
will stop accidental private message leaks. | 2018-04-07 16:40:45 +02:00 |  | 
				
					
						| 
								
								
									 eal | 7c47534970 | MastoAPI: Persist frontend timelines and settings. | 2018-04-07 17:26:56 +03:00 |  | 
				
					
						| 
								
								
									 lain | 303289d7da | MastodonAPI search: return only create activities. | 2018-04-05 13:59:53 +02:00 |  | 
				
					
						| 
								
								
									 lain | b3b7ab5d9a | Load all users at once in timelines. | 2018-04-02 16:35:41 +02:00 |  | 
				
					
						| 
								
								
									 Morgan Bazalgette | 5e4bb4ad92 | masto api: run emojis through mediaproxy fixes #107 | 2018-04-02 12:04:11 +02:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 2dcc6037d0 | mastodon search api: implement a reasonable hashtags stub | 2018-04-01 02:12:10 -05:00 |  | 
				
					
						| 
								
								
									 lain | 4afbef39f4 | Format the code. | 2018-03-30 15:01:53 +02:00 |  | 
				
					
						| 
								
								
									 Morgan Bazalgette | 457e040473 | Add char_limit to initial-state of mastofe | 2018-03-30 00:59:49 +02:00 |  | 
				
					
						| 
								
								
									 lain | 37e5014d3e | Reduce OP fetching queries. | 2018-03-27 18:18:24 +02:00 |  | 
				
					
						| 
								
								
									 lain | ff7afe46b9 | Don't try to fetch OP if none is there. | 2018-03-27 17:43:08 +02:00 |  | 
				
					
						| 
								
								
									 lain | d2099c849d | More Jason changes. | 2018-03-27 16:45:38 +02:00 |  | 
				
					
						| 
								
								
									 lain | 09de76ad5a | Return "audio" info in mastodon api. | 2018-03-25 17:08:54 +02:00 |  | 
				
					
						| 
								
								
									 lain | fbe9aa3506 | Strip html from emoji stuff. | 2018-03-23 19:52:08 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 000b3f1837 | mastodon api: fix rendering the mentions JSON Signed-off-by: lain <lain@soykaf.club> | 2018-03-16 11:25:41 +01:00 |  | 
				
					
						| 
								
								
									 eal | 18e1202a3b | MastoAPI: Add unimplemented status card endpoint. | 2018-03-09 20:58:00 +02:00 |  | 
				
					
						| 
								
								
									 eal | 2e32012d57 | Add next and previous headers to user pages and tag timelines. | 2018-03-09 16:54:10 +02:00 |  | 
				
					
						| 
								
								
									 lain | e1b0ccce77 | Mastodon API context fix. | 2018-02-25 21:25:33 +01:00 |  | 
				
					
						| 
								
								
									 lain | e9de04b74b | Add support for outgoing update. | 2018-02-25 21:08:32 +01:00 |  | 
				
					
						| 
								
								
									 lain | 8a47974217 | Fix specs. | 2018-02-25 18:11:03 +01:00 |  | 
				
					
						| 
								
								
									 lain | 95e6e82138 | Correctly display accounts without name. | 2018-02-22 19:22:10 +01:00 |  | 
				
					
						| 
								
								
									 lain | 486e205810 | Remove some noise. | 2018-02-20 08:52:31 +01:00 |  | 
				
					
						| 
								
								
									 lain | 5d89997a70 | Respect visibility in API. | 2018-02-18 15:50:34 +01:00 |  | 
				
					
						| 
								
								
									 lain | c974f6544f | Show users their own posts in timeline. | 2018-02-18 15:20:36 +01:00 |  | 
				
					
						| 
								
								
									 lain | d4b08dd838 | MastodonAPI: Post with visibility settings | 2018-02-18 14:56:36 +01:00 |  | 
				
					
						| 
								
								
									 lain | 539340d914 | Handle sensitive property. | 2018-02-18 14:14:16 +01:00 |  | 
				
					
						| 
								
								
									 lain | 912ca56e59 | Mastodon StatusView: Return correct visibility. | 2018-02-18 13:51:51 +01:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | e47f60c053 | provide instance thumbnail at /api/v1/instance (debug) | 2018-01-31 23:04:34 +09:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | a4335e391f | provide instance thumbnail at /api/v1/instance | 2018-01-31 22:51:25 +09:00 |  | 
				
					
						| 
								
								
									 eal | 80f6ac412a | Merge branch 'default-pictures' into 'develop' Add a default profile picture and banner.
See merge request pleroma/pleroma!48 | 2018-01-15 20:26:49 +00:00 |  | 
				
					
						| 
								
								
									 eal | 14b086eec2 | Add a default profile picture and banner. This removes the placehold.it dependency. | 2018-01-15 22:18:17 +02:00 |  |