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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae38b72e24
								
							
						 | 
						
							
							
								
								MastoAPI: Fix reblog view.
							
							
							
							
							
						 | 
						
							2017-09-17 14:25:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								260f09dd6c
								
							
						 | 
						
							
							
								
								MastoAPI: Return reblogs, too.
							
							
							
							
							
						 | 
						
							2017-09-17 14:20:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								6000f61727
								
							
						 | 
						
							
							
								
								MastoAPI: Add repeats to statusview.
							
							
							
							
							
						 | 
						
							2017-09-17 13:54:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								422d0f324f
								
							
						 | 
						
							
							
								
								MastodonAPI: Add user favorites endpoint.
							
							
							
							
							
						 | 
						
							2017-09-17 13:09:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								0872f5f394
								
							
						 | 
						
							
							
								
								Add undocumented default user default settings.
							
							
							
							
							
						 | 
						
							2017-09-16 11:52:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								c36229c4aa
								
							
						 | 
						
							
							
								
								Add remote user fetching to search.
							
							
							
							
							
						 | 
						
							2017-09-16 11:26:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								73bdfd6c2b
								
							
						 | 
						
							
							
								
								Set search config to 'english'.
							
							
							
							
							
						 | 
						
							2017-09-16 10:50:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f0a2a714b
								
							
						 | 
						
							
							
								
								Add basic search.
							
							
							
							
							
						 | 
						
							2017-09-16 10:42:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d659fcc195
								
							
						 | 
						
							
							
								
								MastoAPI: Fix date in account view.
							
							
							
							
							
						 | 
						
							2017-09-15 17:50:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								50409326a8
								
							
						 | 
						
							
							
								
								Refactor posting and make character limit configurable.
							
							
							
							
							
						 | 
						
							2017-09-15 14:17:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac2893a945
								
							
						 | 
						
							
							
								
								Add instance config options.
							
							
							
							
							
						 | 
						
							2017-09-15 10:26:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								3aaf6608c6
								
							
						 | 
						
							
							
								
								MastoAPI: Set user id on replies.
							
							
							
							
							
						 | 
						
							2017-09-15 08:49:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ca853fb61
								
							
						 | 
						
							
							
								
								MastoAPI: Follower-related changes
							
							
							
							
							
						 | 
						
							2017-09-14 18:30:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc85c9f086
								
							
						 | 
						
							
							
								
								Add tag timelines.
							
							
							
							
							
						 | 
						
							2017-09-14 13:22:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0363e8055
								
							
						 | 
						
							
							
								
								MastoAPI: Add favourited_by/reblogged_by.
							
							
							
							
							
						 | 
						
							2017-09-14 09:50:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8701282d4
								
							
						 | 
						
							
							
								
								MastoAPI: fake out 'application' property.
							
							
							
							
							
						 | 
						
							2017-09-14 09:14:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								6258c6b6b3
								
							
						 | 
						
							
							
								
								MastoAPI: Also return text_url in attachments.
							
							
							
							
							
						 | 
						
							2017-09-14 08:38:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								641c24cdd4
								
							
						 | 
						
							
							
								
								Add media upload endpoint.
							
							
							
							
							
						 | 
						
							2017-09-14 08:08:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								3184939055
								
							
						 | 
						
							
							
								
								Ensure non-null bio.
							
							
							
							
							
						 | 
						
							2017-09-13 17:45:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d168ef5a9e
								
							
						 | 
						
							
							
								
								MastoAPI: Add accounts getting.
							
							
							
							
							
						 | 
						
							2017-09-13 17:36:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad5001828e
								
							
						 | 
						
							
							
								
								Oh no! More datetime fixes!
							
							
							
							
							
						 | 
						
							2017-09-13 17:18:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								14b4029b1d
								
							
						 | 
						
							
							
								
								Reparse time to ensure correct format.
							
							
							
							
							
						 | 
						
							2017-09-13 16:38:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								94be93aad0
								
							
						 | 
						
							
							
								
								Allign datetime format with mastodon.
							
							
							
							
							
						 | 
						
							2017-09-13 16:26:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2faee01ee
								
							
						 | 
						
							
							
								
								Return iso8601 date.
							
							
							
							
							
						 | 
						
							2017-09-13 16:09:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6286152b9
								
							
						 | 
						
							
							
								
								Fix logic.
							
							
							
							
							
						 | 
						
							2017-09-13 16:05:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								49929321c7
								
							
						 | 
						
							
							
								
								Add relationships to masto api.
							
							
							
							
							
						 | 
						
							2017-09-13 15:55:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								1bc58230ee
								
							
						 | 
						
							
							
								
								Remove milliseconds from mastodon api response.
							
							
							
							
							
						 | 
						
							2017-09-12 13:31:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								7331733d30
								
							
						 | 
						
							
							
								
								Use signed integer as attachment id.
							
							
							
							
							
						 | 
						
							2017-09-12 11:43:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								b58b35bf56
								
							
						 | 
						
							
							
								
								Use hash of attachment url as id.
							
							
							
							
							
							
							
							Pretty hacky, let's see if we can get away with this. 
							
						 | 
						
							2017-09-12 11:28:12 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								44a650235b
								
							
						 | 
						
							
							
								
								MastoAPI: Remove domain ending from account name.
							
							
							
							
							
						 | 
						
							2017-09-12 09:34:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1d9f2f6cd
								
							
						 | 
						
							
							
								
								MastoAPI: More link headers.
							
							
							
							
							
						 | 
						
							2017-09-12 09:06:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								0df4a0f26d
								
							
						 | 
						
							
							
								
								Add parentheses.
							
							
							
							
							
						 | 
						
							2017-09-12 08:53:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								02f824f9d5
								
							
						 | 
						
							
							
								
								MastoAPI: Add link headers to home timeline
							
							
							
							
							
						 | 
						
							2017-09-12 08:51:56 +02:00 | 
						
						
							
							
							
								
							
							
						 |