Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								a743940463 
								
							 
						 
						
							
							
								
								MastoAPI: Implement all streaming functions.  
							
							
							
						 
						
							2017-11-16 16:49:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								ced0d64d75 
								
							 
						 
						
							
							
								
								MastoAPI: Make attachment ids strings.  
							
							
							
						 
						
							2017-11-15 18:58:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								1cca544e20 
								
							 
						 
						
							
							
								
								Merge branch 'twitterapi-bitlbee' into 'develop'  
							
							... 
							
							
							
							TwitterAPI: Add missing endpoints for bitlbee.
Closes  #67 
See merge request pleroma/pleroma!18  
							
						 
						
							2017-11-14 16:47:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f9828e578c 
								
							 
						 
						
							
							
								
								TwitterAPI: Add /users/show.  
							
							
							
						 
						
							2017-11-14 17:34:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								3533bf7eac 
								
							 
						 
						
							
							
								
								TwitterAPI: Add /friends/ids.  
							
							
							
						 
						
							2017-11-14 16:04:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								06c3ee3bac 
								
							 
						 
						
							
							
								
								Accept 1 as true.  
							
							
							
						 
						
							2017-11-14 15:54:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								c84723b679 
								
							 
						 
						
							
							
								
								MastoAPI: Add media timelines.  
							
							
							
						 
						
							2017-11-14 15:41:16 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								e942e1e552 
								
							 
						 
						
							
							
								
								Correct mimetype on bad uploads.  
							
							
							
						 
						
							2017-11-09 15:01:59 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f7fc048aeb 
								
							 
						 
						
							
							
								
								TwitterAPI user view: add follows_you.  
							
							
							
						 
						
							2017-11-08 19:13:03 +02: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								7da978f3f5 
								
							 
						 
						
							
							
								
								Linkify fixes.  
							
							
							
						 
						
							2017-11-07 12:06:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f85566324e 
								
							 
						 
						
							
							
								
								Allow profile fetching for authenticated users only.  
							
							
							
						 
						
							2017-11-07 00:33:44 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								632da6c927 
								
							 
						 
						
							
							
								
								Don't create notifications if the user is blocked.  
							
							
							
						 
						
							2017-11-02 22:08:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								6a5f087174 
								
							 
						 
						
							
							
								
								Add blocks to User.  
							
							
							
						 
						
							2017-11-02 21:57:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								345ad870f7 
								
							 
						 
						
							
							
								
								Clean up user_test.exs.  
							
							
							
						 
						
							2017-11-02 21:57:21 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								0c871e5c6e 
								
							 
						 
						
							
							
								
								Fix specs.  
							
							
							
						 
						
							2017-10-31 17:57:26 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								4cbf17dac6 
								
							 
						 
						
							
							
								
								Save cws in the activitypub data.  
							
							
							
						 
						
							2017-10-31 17:30:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								4dcbb64f19 
								
							 
						 
						
							
							
								
								Avoid potentially slow count queries for user note count.  
							
							... 
							
							
							
							For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query. 
							
						 
						
							2017-10-31 16:37:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								968a546d4a 
								
							 
						 
						
							
							
								
								MastoAPI: Return id as string instead of integer.  
							
							
							
						 
						
							2017-10-31 14:51:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								2f39bb6b43 
								
							 
						 
						
							
							
								
								Typo.  
							
							
							
						 
						
							2017-10-31 14:46:01 +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