Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								95f6240889 
								
							 
						 
						
							
							
								
								Fix minor spelling error  
							
							
							
						 
						
							2020-05-27 14:34:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1fa7aa9fc5 
								
							 
						 
						
							
							
								
								Merge branch 'emoji-react-better-errors' into 'develop'  
							
							... 
							
							
							
							EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569  
							
						 
						
							2020-05-22 14:36:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba106aa9c8 
								
							 
						 
						
							
							
								
								Fix notifications mark as read API  
							
							
							
						 
						
							2020-05-22 18:15:36 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bcb549531f 
								
							 
						 
						
							
							
								
								EmojiReactionController: Return more appropriate error.  
							
							
							
						 
						
							2020-05-22 14:38:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f166316f50 
								
							 
						 
						
							
							
								
								Merge branch 'openapi/pleroma-api/pleroma' into 'develop'  
							
							... 
							
							
							
							Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564  
							
						 
						
							2020-05-21 13:30:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								265746b21f 
								
							 
						 
						
							
							
								
								Merge branch 'openapi/pleroma-api/emojis' into 'develop'  
							
							... 
							
							
							
							Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549  
							
						 
						
							2020-05-20 12:08:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ba6e1c322 
								
							 
						 
						
							
							
								
								Move notification actions to PleromaAPI.NotificationController  
							
							
							
						 
						
							2020-05-20 15:15:13 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3fc8b22b1 
								
							 
						 
						
							
							
								
								Move conversation actions to PleromaAPI.ConversationController  
							
							
							
						 
						
							2020-05-20 15:15:13 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a5de0f454 
								
							 
						 
						
							
							
								
								Move reaction actions to EmojiReactionController  
							
							
							
						 
						
							2020-05-20 15:15:13 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								490a3a34b6 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for PleromaAPI.PleromaAPIController  
							
							
							
						 
						
							2020-05-20 15:15:13 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6609714d66 
								
							 
						 
						
							
							
								
								Move Scrobble views to ScrobbleView  
							
							
							
						 
						
							2020-05-19 16:26:06 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								524d04d921 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for PleromaAPI.ScrobbleController  
							
							
							
						 
						
							2020-05-19 16:26:06 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe5d423b43 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for MascotController  
							
							
							
						 
						
							2020-05-18 22:01:18 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aef31c69df 
								
							 
						 
						
							
							
								
								Rename EmojiAPIController to EmojiPackController  
							
							
							
						 
						
							2020-05-18 19:43:25 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bde8dfec2 
								
							 
						 
						
							
							
								
								Cleanup Pleroma.Emoji.Pack  
							
							
							
						 
						
							2020-05-18 19:43:23 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e4de715b3 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for PleromaAPI.EmojiAPIController  
							
							
							
						 
						
							2020-05-18 19:28:46 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								215daabdb4 
								
							 
						 
						
							
							
								
								copyright update  
							
							
							
						 
						
							2020-05-18 15:15:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b28d812cf 
								
							 
						 
						
							
							
								
								Merge branch 'restricted-relations-embedding' into 'develop'  
							
							... 
							
							
							
							Restricted support for embedded relationships
See merge request pleroma/pleroma!2456  
							
						 
						
							2020-05-17 07:26:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6802dc28ba 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for PleromaAPI.AccountController  
							
							
							
						 
						
							2020-05-13 19:06:46 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aee88d11be 
								
							 
						 
						
							
							
								
								[ #2456 ] Removed support for embedded relationships in account view.  
							
							
							
						 
						
							2020-05-10 09:16:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								14a49a0483 
								
							 
						 
						
							
							
								
								[ #2456 ] Dropped support for embedded pleroma/account/relationship in statuses and notifications.  
							
							
							
						 
						
							2020-05-09 18:05:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b2924ab1fb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding  
							
							
							
						 
						
							2020-05-08 21:37:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ef55d24054 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator  
							
							
							
						 
						
							2020-05-07 18:53:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7ac0cffb34 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator  
							
							
							
						 
						
							2020-05-07 15:03:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0c22df226 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced  
							
							
							
						 
						
							2020-05-07 14:45:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								3d0c567fbc 
								
							 
						 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController  
							
							
							
						 
						
							2020-05-07 08:14:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b34debe615 
								
							 
						 
						
							
							
								
								Undoing: Move undoing reactions to the pipeline everywhere.  
							
							
							
						 
						
							2020-05-05 16:17:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								db55dc9445 
								
							 
						 
						
							
							
								
								ActivityPub: Remove react_with_emoji.  
							
							
							
						 
						
							2020-05-05 12:28:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								d5cdc907e3 
								
							 
						 
						
							
							
								
								Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).  
							
							... 
							
							
							
							Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests. 
							
						 
						
							2020-05-01 18:45:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a487e4d0b 
								
							 
						 
						
							
							
								
								fix for auth check  
							
							
							
						 
						
							2020-04-30 17:50:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								36abeedf9f 
								
							 
						 
						
							
							
								
								error rename  
							
							
							
						 
						
							2020-04-30 16:09:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ddb757f743 
								
							 
						 
						
							
							
								
								emoji api packs changes in routes with docs update  
							
							
							
						 
						
							2020-04-30 16:09:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								342f55fb92 
								
							 
						 
						
							
							
								
								refactor emoji api with fixes  
							
							
							
						 
						
							2020-04-30 15:45:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5839e67eb8 
								
							 
						 
						
							
							
								
								return data only for updated emoji  
							
							
							
						 
						
							2020-04-30 15:24:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b4139cc547 
								
							 
						 
						
							
							
								
								[ #2409 ] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests.  
							
							
							
						 
						
							2020-04-24 22:25:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								00e62161f6 
								
							 
						 
						
							
							
								
								[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.  
							
							
							
						 
						
							2020-04-24 16:52:38 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								badd888ccb 
								
							 
						 
						
							
							
								
								Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'  
							
							... 
							
							
							
							Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349  
							
						 
						
							2020-04-16 21:58:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								942d7467ca 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into features/remove-user-source_data  
							
							
							
						 
						
							2020-04-16 21:28:52 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc 
								
							 
						 
						
							
							
								
								profile emojis in User.emoji instead of source_data  
							
							
							
						 
						
							2020-04-10 06:20:02 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05da5f5cca 
								
							 
						 
						
							
							
								
								Update Copyrights  
							
							
							
						 
						
							2020-03-03 16:44:49 -06: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