feld 
								
							 
						 
						
							
							
							
							
								
							
							
								8d2ea95402 
								
							 
						 
						
							
							
								
								Merge branch 'feature/2438-users-posts-total-count' into 'develop'  
							
							... 
							
							
							
							Feature/2438 users/instances posts total count
Closes  #2438 
See merge request pleroma/pleroma!3270  
							
						 
						
							2021-02-03 14:21:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d289ad8579 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2411-mutes-api'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md 
							
						 
						
							2021-02-02 17:57:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fdf1dfed56 
								
							 
						 
						
							
							
								
								only_remote -> remote renaming  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba512cbea4 
								
							 
						 
						
							
							
								
								/api/v1/accounts/:id/statuses docs update 
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77f0a0af7d 
								
							 
						 
						
							
							
								
								more tests and update for docs and changelog  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e21af1cfe4 
								
							 
						 
						
							
							
								
								only_media & only_remote docs and changelog  
							
							
							
						 
						
							2021-02-01 14:11:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c369d2b930 
								
							 
						 
						
							
							
								
								support for with_relationships parameter  
							
							... 
							
							
							
							in /api/v1/mutes and /api/v1/accounts/:id endpoints 
							
						 
						
							2021-01-29 08:41:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4158e8bf0 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the instance adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6806c03e85 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the user statuses adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								6284e8f4b2 
								
							 
						 
						
							
							
								
								Add development section  
							
							... 
							
							
							
							* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
  * index.md
  * authentication_authorization.md
  * mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md 
							
						 
						
							2021-01-10 08:25:36 +00:00