lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								35ac549a99
								
							
						 | 
						
							
							
								
								Merge branch 'media-proxy' into 'develop'
							
							
							
							
							
							
							
							Media proxy
See merge request pleroma/pleroma!34 
							
						 | 
						
							2017-12-20 14:22:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1f79c0dca
								
							
						 | 
						
							
							
								
								Fix timelines in subway tooter.
							
							
							
							
							
						 | 
						
							2017-12-19 16:15:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								47887ac848
								
							
						 | 
						
							
							
								
								MastoAPI: Fix always-sensitive bugs.
							
							
							
							
							
						 | 
						
							2017-12-18 16:56:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9093b2cf49
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into media-proxy
							
							
							
							
							
						 | 
						
							2017-12-11 02:45:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								5436dbaeaf
								
							
						 | 
						
							
							
								
								MastoAPI: don't add attachment links.
							
							
							
							
							
						 | 
						
							2017-12-07 20:44:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								72f7baa654
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into media-proxy
							
							
							
							
							
						 | 
						
							2017-12-05 14:12:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								5637d163e6
								
							
						 | 
						
							
							
								
								MastodonAPI: Add proper user count.
							
							
							
							
							
						 | 
						
							2017-11-30 14:59:44 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5f35fdcf5d
								
							
						 | 
						
							
							
								
								media proxy: good enough wip
							
							
							
							
							
						 | 
						
							2017-11-28 20:50:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d16b613929
								
							
						 | 
						
							
							
								
								MastodonUI login: Show error message on error.
							
							
							
							
							
						 | 
						
							2017-11-23 12:06:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa19de97ba
								
							
						 | 
						
							
							
								
								MastoAPI: no more than 4 attachments.
							
							
							
							
							
						 | 
						
							2017-11-20 22:49:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf0bbf320d
								
							
						 | 
						
							
							
								
								MastoAPI: Add max_toot_chars.
							
							
							
							
							
						 | 
						
							2017-11-20 08:54:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f099dac67
								
							
						 | 
						
							
							
								
								MastodonAPI: Add sign out.
							
							
							
							
							
							
							
							Close #79 
							
						 | 
						
							2017-11-19 13:23:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								c336a13d2c
								
							
						 | 
						
							
							
								
								MastoAPI: Only return create activties in contexts.
							
							
							
							
							
						 | 
						
							2017-11-19 12:59:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thog
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								59770c3f5c
								
							
						 | 
						
							
							
								
								Fix all compilation warnings
							
							
							
							
							
						 | 
						
							2017-11-19 02:22:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c60cc88df
								
							
						 | 
						
							
							
								
								Redirect to Getting Started on login.
							
							
							
							
							
						 | 
						
							2017-11-16 20:47:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a743940463
								
							
						 | 
						
							
							
								
								MastoAPI: Implement all streaming functions.
							
							
							
							
							
						 | 
						
							2017-11-16 16:49:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5719f69ae3
								
							
						 | 
						
							
							
								
								MastodonAPI: Stream fixes.
							
							
							
							
							
						 | 
						
							2017-11-16 13:48:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								8de890a0d9
								
							
						 | 
						
							
							
								
								Add custom emoji to Mastodon UI initial state.
							
							
							
							
							
						 | 
						
							2017-11-16 09:40:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ced0d64d75
								
							
						 | 
						
							
							
								
								MastoAPI: Make attachment ids strings.
							
							
							
							
							
						 | 
						
							2017-11-15 18:58:39 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6210183e1
								
							
						 | 
						
							
							
								
								Add mastodon API endpoint for custom emoji.
							
							
							
							
							
						 | 
						
							2017-11-07 21:55:01 +02: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								44295dd49a
								
							
						 | 
						
							
							
								
								MastoAPI: Include CW.
							
							
							
							
							
						 | 
						
							2017-10-31 17:49:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								968a546d4a
								
							
						 | 
						
							
							
								
								MastoAPI: Return id as string instead of integer.
							
							
							
							
							
						 | 
						
							2017-10-31 14:51:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce7f9f527c
								
							
						 | 
						
							
							
								
								MastoAPI: Always return an url for statuses.
							
							
							
							
							
							
							
							External url if available, id if not. 
							
						 | 
						
							2017-10-31 14:40:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								502cb38cd6
								
							
						 | 
						
							
							
								
								Move user search to User module.
							
							
							
							
							
						 | 
						
							2017-10-30 19:23:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								efe12e1a73
								
							
						 | 
						
							
							
								
								Fix /api/v1/accounts/search by splitting account search into its own function
							
							
							
							
							
						 | 
						
							2017-10-30 03:37:07 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ffc6da207
								
							
						 | 
						
							
							
								
								Clean style.
							
							
							
							
							
							
							
							Use 'follow' instead of 'follows' and correct indentation. 
							
						 | 
						
							2017-10-29 00:30:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								c56d28f96c
								
							
						 | 
						
							
							
								
								Fix return type of /api/v1/follows
							
							
							
							
							
						 | 
						
							2017-10-29 00:07:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								11d2287476
								
							
						 | 
						
							
							
								
								Return error message on errors
							
							
							
							
							
						 | 
						
							2017-10-28 17:09:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								813d2eaaf0
								
							
						 | 
						
							
							
								
								Add mastodon API endpoint for follow
							
							
							
							
							
						 | 
						
							2017-10-28 17:09:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								64bc38e009
								
							
						 | 
						
							
							
								
								MastoAPI: Add emoji output.
							
							
							
							
							
						 | 
						
							2017-10-23 16:27:51 +02:00 | 
						
						
							
							
							
								
							
							
						 |