lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b04328c3de 
								
							 
						 
						
							
							
								
								ChatController: Add mark_as_read  
							
							
							
						 
						
							2020-05-04 13:10:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c40afe5ba0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-04 10:43:20 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								145d35ff70 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/pleroma_api/controllers/chat_controller.ex  
							
							
							
						 
						
							2020-04-29 19:49:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0c491b904d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-04-29 13:19:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ad82a216ff 
								
							 
						 
						
							
							
								
								Chat API: Align more to Pleroma/Mastodon API.  
							
							
							
						 
						
							2020-04-27 17:48:34 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								66c2eb670b 
								
							 
						 
						
							
							
								
								ChatController: Validate parameters.  
							
							
							
						 
						
							2020-04-21 18:23:00 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								970b74383b 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							
							
						 
						
							2020-04-20 12:29:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8c2c325598 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-04-17 15:51:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d45ae64858 
								
							 
						 
						
							
							
								
								ChatController: Use OAuth scopes.  
							
							
							
						 
						
							2020-04-17 13:04:46 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f8c3ae7a62 
								
							 
						 
						
							
							
								
								ChatController: Handle pagination.  
							
							
							
						 
						
							2020-04-16 18:43:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6ace22b56a 
								
							 
						 
						
							
							
								
								Chat: Add views, don't return them in timeline queries.  
							
							
							
						 
						
							2020-04-15 18:23:16 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								44bfb491ea 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-04-15 14:41:43 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2cc6841424 
								
							 
						 
						
							
							
								
								ChatController: Basic message posting.  
							
							
							
						 
						
							2020-04-09 17:18:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e8fd0dd689 
								
							 
						 
						
							
							
								
								ChatController: Basic support for returning messages.  
							
							
							
						 
						
							2020-04-09 16:59:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								68abea313d 
								
							 
						 
						
							
							
								
								ChatController: Add creation and return of chats.  
							
							
							
						 
						
							2020-04-09 15:13:55 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22018adae6 
								
							 
						 
						
							
							
								
								Fix Dialyzer warnings  
							
							
							
						 
						
							2020-02-25 18:34:56 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								e2f2602fdc 
								
							 
						 
						
							
							
								
								Merge branch 'emoji-api-errors' into 'develop'  
							
							... 
							
							
							
							Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161  
							
						 
						
							2020-01-30 14:13:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								b3e9c87724 
								
							 
						 
						
							
							
								
								Update emoji_api_controller.ex  
							
							
							
						 
						
							2020-01-30 14:09:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e7fee0d6fa 
								
							 
						 
						
							
							
								
								emoji api error on not writable dir  
							
							
							
						 
						
							2020-01-29 15:31:34 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								835ac2157c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2019-12-10 08:55:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								40e1817f70 
								
							 
						 
						
							
							
								
								[ #1427 ] Fixes / improvements of admin scopes support. Added tests.  
							
							
							
						 
						
							2019-12-06 20:33:47 +03:00