Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0238d010a 
								
							 
						 
						
							
							
								
								Improve OpenAPI schema  
							
							... 
							
							
							
							- Removes unneeded wrapping in examples
- Adds `:format` attributes 
							
						 
						
							2020-04-21 23:30:24 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ed3974af24 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for AccountController.identity_proofs operation  
							
							
							
						 
						
							2020-04-20 18:40:02 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								736fead494 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into openapi/account  
							
							
							
						 
						
							2020-04-20 18:40:02 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								28165dad3a 
								
							 
						 
						
							
							
								
								Merge branch 'cleanup-subscription-controller' into 'develop'  
							
							... 
							
							
							
							Cleanup SubscriptionController
See merge request pleroma/pleroma!2393  
							
						 
						
							2020-04-20 13:01:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								8b4de61d64 
								
							 
						 
						
							
							
								
								Fix ObjectAgePolicyTest  
							
							... 
							
							
							
							The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests 
							
						 
						
							2020-04-20 12:59:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								918a8094fc 
								
							 
						 
						
							
							
								
								Merge branch '1559-follow-request-notifications' into 'develop'  
							
							... 
							
							
							
							[#1559 ] Support for "follow_request" notifications
Closes  #1559 
See merge request pleroma/pleroma!2354  
							
						 
						
							2020-04-19 21:45:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								79445ae5d2 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'  
							
							... 
							
							
							
							migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes  #1697 
See merge request pleroma/pleroma!2403  
							
						 
						
							2020-04-18 06:59:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								24f760c2f7 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex  
							
							
							
						 
						
							2020-04-17 22:48:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eb61564005 
								
							 
						 
						
							
							
								
								migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo  
							
							
							
						 
						
							2020-04-17 23:57:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								66f55106bd 
								
							 
						 
						
							
							
								
								[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.  
							
							
							
						 
						
							2020-04-17 21:21:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								163341857a 
								
							 
						 
						
							
							
								
								Improve OpenAPI errors  
							
							
							
						 
						
							2020-04-17 19:27:22 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e0d7847bc5 
								
							 
						 
						
							
							
								
								Merge branch 'sideeffects-test' into 'develop'  
							
							... 
							
							
							
							SideEffects: Test for notification creation.
See merge request pleroma/pleroma!2399  
							
						 
						
							2020-04-17 14:03:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								26d9c83316 
								
							 
						 
						
							
							
								
								SideEffects: Test for notification creation.  
							
							
							
						 
						
							2020-04-17 15:50:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6936854878 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'  
							
							... 
							
							
							
							migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes  #1695 
See merge request pleroma/pleroma!2398  
							
						 
						
							2020-04-17 13:40:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6e6f95c6ae 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-04-17 16:23:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46f051048f 
								
							 
						 
						
							
							
								
								migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering  
							
							
							
						 
						
							2020-04-17 14:32:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								a17bfb5fab 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1584-client-captcha-options' into 'develop'  
							
							... 
							
							
							
							Creating trusted app from adminFE & mix task
Closes  #1584 
See merge request pleroma/pleroma!2252  
							
						 
						
							2020-04-17 09:19:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								9c76d70a47 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'  
							
							... 
							
							
							
							Added need_reboot endpoint to admin api
Closes  #1677 
See merge request pleroma/pleroma!2373  
							
						 
						
							2020-04-17 08:55:46 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								28bcde5d98 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1691-feed-render' into 'develop'  
							
							... 
							
							
							
							Fix for use of `published` field from different entities
Closes  #1691 
See merge request pleroma/pleroma!2395  
							
						 
						
							2020-04-16 18:38:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								942d7467ca 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into features/remove-user-source_data  
							
							
							
						 
						
							2020-04-16 21:28:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4d330d9df1 
								
							 
						 
						
							
							
								
								fix for use of published from different entities  
							
							
							
						 
						
							2020-04-16 18:05:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								252528a4b9 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/remove-upgrade-changeset' into 'develop'  
							
							... 
							
							
							
							Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368  
							
						 
						
							2020-04-16 14:59:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72ef6cc4f2 
								
							 
						 
						
							
							
								
								added need_reboot endpoint to admin api  
							
							
							
						 
						
							2020-04-16 16:03:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf4ebba774 
								
							 
						 
						
							
							
								
								Cleanup SubscriptionController  
							
							
							
						 
						
							2020-04-15 23:14:47 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bde1189c34 
								
							 
						 
						
							
							
								
								[ #2349 ] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.  
							
							
							
						 
						
							2020-04-15 21:19:16 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								65f04b7806 
								
							 
						 
						
							
							
								
								Fix credo warning  
							
							
							
						 
						
							2020-04-15 17:16:32 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16f4787bf7 
								
							 
						 
						
							
							
								
								Add a TODO note  
							
							
							
						 
						
							2020-04-15 16:51:37 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e647ff55a 
								
							 
						 
						
							
							
								
								Abstract pagination params in OpenAPI spec  
							
							
							
						 
						
							2020-04-15 16:45:45 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								8ed162b655 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2020-04-15 15:57:00 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								5a2e45a218 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex  
							
							
							
						 
						
							2020-04-15 11:29:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								81a4c15816 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex  
							
							
							
						 
						
							2020-04-15 10:48:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								a45bd91d4e 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex  
							
							
							
						 
						
							2020-04-15 10:48:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								bfa26b0937 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex  
							
							
							
						 
						
							2020-04-15 10:30:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								a794ba655f 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex  
							
							
							
						 
						
							2020-04-15 10:27:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								a7feca1604 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex  
							
							
							
						 
						
							2020-04-15 10:26:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								d3e876aeee 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex  
							
							
							
						 
						
							2020-04-15 10:26:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								96eae62995 
								
							 
						 
						
							
							
								
								Merge branch 'fix/openapi-form-mimetype' into 'develop'  
							
							... 
							
							
							
							openapi: add application/x-www-form-urlencoded to body types
Closes  #1683 
See merge request pleroma/pleroma!2387  
							
						 
						
							2020-04-14 22:01:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cc4ff19e34 
								
							 
						 
						
							
							
								
								openapi: add application/x-www-form-urlencoded to body types  
							
							... 
							
							
							
							Closes  #1683  
						
							2020-04-15 00:49:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3bf78f2be7 
								
							 
						 
						
							
							
								
								Fix Oban not receiving :ok from RichMediaHelper job  
							
							
							
						 
						
							2020-04-14 11:43:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4576520461 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'issue/1276' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1877  
							
						 
						
							2020-04-14 16:32:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								247e6fcb90 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into openapi/account  
							
							
							
						 
						
							2020-04-14 19:45:22 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								60cc7d6c9a 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1276' into 'develop'  
							
							... 
							
							
							
							[#1276 ] An endpoint for getting unread notification count
Closes  #1276 
See merge request pleroma/pleroma!1877  
							
						 
						
							2020-04-14 06:38:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4dca712e90 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for DomainBlockController  
							
							
							
						 
						
							2020-04-13 22:44:52 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a16b3dbcbf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-04-13 21:19:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e0b42d99f 
								
							 
						 
						
							
							
								
								Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements  
							
							
							
						 
						
							2020-04-13 18:17:09 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab185d3ea4 
								
							 
						 
						
							
							
								
								Add spec for AccountController.follows  
							
							
							
						 
						
							2020-04-13 18:17:09 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								68a979b824 
								
							 
						 
						
							
							
								
								Add specs for AccountController.block and AccountController.unblock  
							
							
							
						 
						
							2020-04-13 18:17:08 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4195d4a68 
								
							 
						 
						
							
							
								
								Add specs for AccountController.mute and AccountController.unmute  
							
							
							
						 
						
							2020-04-13 18:17:08 +04:00