| 
								
								
									 eal | c84723b679 | MastoAPI: Add media timelines. | 2017-11-14 15:41:16 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 773eba4f0b | Update frontend. | 2017-11-14 09:34:28 +01: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 | 87dee3902a | Merge branch 'filetype-recognition' into 'develop' Use headers for file content type recognition.
See merge request pleroma/pleroma!14 | 2017-11-12 09:27:59 +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 | 18a95cd375 | Add common video and audio types. | 2017-11-12 01:20:50 +02:00 |  | 
				
					
						| 
								
								
									 eal | fc7483cb3c | MastoAPI: Add update credentials endpoint. | 2017-11-12 00:27:09 +02:00 |  | 
				
					
						| 
								
								
									 eal | 260b148b92 | Use headers for file content type recognition. | 2017-11-11 23:24:54 +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 | 1b8ad9f731 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop | 2017-11-09 16:49:32 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 266d9c008d | MastoAPI: Fetch statuses in search. | 2017-11-09 16:48:45 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 2247d7580e | Merge branch 'fix-tootdon-image-uploads' into 'develop' Correct mimetype on bad uploads.
See merge request pleroma/pleroma!12 | 2017-11-09 14:41:44 +00:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ccde03285d | add sort index for activities | 2017-11-09 15:16:10 +01:00 |  | 
				
					
						| 
								
								
									 eal | e942e1e552 | Correct mimetype on bad uploads. | 2017-11-09 15:01:59 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9e60de695d | Fix migration for empty db. | 2017-11-09 13:45:17 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6bf261589f | Update activities in own migration. | 2017-11-09 13:32:53 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 20b8b87743 | Update in chunks. | 2017-11-09 12:33:38 +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 |  | 
				
					
						| 
								
								
									 Roger Braun | 36557155af | Update frontend. | 2017-11-08 16:16:29 +01:00 |  | 
				
					
						| 
								
								
									 lambda | 8bbbfd72aa | Merge branch 'blocks-in-user-view' into 'develop' TwitterAPI user view: add blocks.
See merge request pleroma/pleroma!10 | 2017-11-08 13:39:02 +00:00 |  | 
				
					
						| 
								
								
									 eal | 4656cb9b99 | TwitterAPI user view: add blocks. | 2017-11-08 13:02:00 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 3bbefd0a1e | Merge branch 'twitter-api-blocks' into 'develop' TwitterAPI: Add blocks.
See merge request pleroma/pleroma!9 | 2017-11-08 10:35:23 +00: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 | f801b695d7 | Update frontend. | 2017-11-07 18:33:06 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | abfcf93dfc | Update fronted. | 2017-11-07 18:27:08 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 722c4614ad | Allow self-rt. | 2017-11-07 16:45:27 +01:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7da978f3f5 | Linkify fixes. | 2017-11-07 12:06:37 +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 | d1c126ac98 | Update README. | 2017-11-06 22:22:36 +02: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 |  |