rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e55876409b 
								
							 
						 
						
							
							
								
								Deactivate local users on deletion instead of deleting the record  
							
							... 
							
							
							
							Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes  pleroma/pleroma#1687  
							
						 
						
							2020-05-02 19:05:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2958a7d246 
								
							 
						 
						
							
							
								
								Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.  
							
							
							
						 
						
							2020-04-22 18:50:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f685cbd309 
								
							 
						 
						
							
							
								
								Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.  
							
							
							
						 
						
							2020-04-21 16:29:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bedf92e064 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement  
							
							
							
						 
						
							2020-04-15 19:20:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a21baf89d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							
							
						 
						
							2020-04-13 09:16:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								fc81e5a49c 
								
							 
						 
						
							
							
								
								Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).  
							
							
							
						 
						
							2020-04-06 10:20:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2f2bd7fe72 
								
							 
						 
						
							
							
								
								Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.  
							
							... 
							
							
							
							See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param. 
							
						 
						
							2020-04-01 19:49:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a2538967c 
								
							 
						 
						
							
							
								
								Support pagination in conversations  
							
							
							
						 
						
							2020-03-24 20:18:27 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								8f7bc07ebc 
								
							 
						 
						
							
							
								
								pleroma_api_controller.ex: Improve conversations error reporting  
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1594  
							
						 
						
							2020-03-15 12:35:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a 
							
						 
						
							2020-03-02 06:08:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								314928333a 
								
							 
						 
						
							
							
								
								Pleroma API: Add endpoint to get reaction information on a single emoji  
							
							
							
						 
						
							2020-02-19 17:16:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								f875b9650a 
								
							 
						 
						
							
							
								
								EmojiReactions: Add Mastodon-aligned reaction endpoints, change response  
							
							
							
						 
						
							2020-02-07 14:52:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b3a877d6c9 
								
							 
						 
						
							
							
								
								Emoji Reactions: Correctly handle deleted users  
							
							
							
						 
						
							2020-01-29 11:43:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a802e07241 
								
							 
						 
						
							
							
								
								Emoji Reactions: Add reacted field to emoji reactions  
							
							
							
						 
						
							2020-01-29 11:39:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								347f3ed2c6 
								
							 
						 
						
							
							
								
								Emoji reactions: Change api format once more  
							
							
							
						 
						
							2020-01-24 10:52:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dd3fc50ea4 
								
							 
						 
						
							
							
								
								Emoji reactions: Change cache and reply format  
							
							
							
						 
						
							2020-01-22 13:57:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5fddf988ea 
								
							 
						 
						
							
							
								
								Pleroma API: emoji_reactions_by does not need authorization  
							
							
							
						 
						
							2020-01-20 13:05:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7973cbdb9f 
								
							 
						 
						
							
							
								
								OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.  
							
							
							
						 
						
							2019-12-15 22:32:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b22ee9d966 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-11-08 13:27:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								0580654485 
								
							 
						 
						
							
							
								
								Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count.  
							
							... 
							
							
							
							Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`. 
							
						 
						
							2019-10-26 02:29:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								52ed2f8f2d 
								
							 
						 
						
							
							
								
								Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read  
							
							
							
						 
						
							2019-10-19 15:24:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d580eedfe9 
								
							 
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							2019-10-07 12:40:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								73b6512907 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-10-07 12:30:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								64095961fe 
								
							 
						 
						
							
							
								
								[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex 
							
						 
						
							2019-10-02 20:42:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4cb603e1df 
								
							 
						 
						
							
							
								
								PleromaAPI: Add unreacting.  
							
							
							
						 
						
							2019-10-02 18:19:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								391c736292 
								
							 
						 
						
							
							
								
								PleromaAPI: Fix emoji_reactions_by  
							
							
							
						 
						
							2019-10-02 18:13:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6068d2254e 
								
							 
						 
						
							
							
								
								PleromaAPIController: Fixes and refactoring.  
							
							
							
						 
						
							2019-09-30 15:13:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b923842e96 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-09-30 13:57:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6b3d5ed6db 
								
							 
						 
						
							
							
								
								Emoji API Controller: Follow phoenix directory structure  
							
							
							
						 
						
							2019-09-23 21:14:51 +03:00