lain 
								
							 
						 
						
							
							
							
							
								
							
							
								923513b641 
								
							 
						 
						
							
							
								
								Federator: Return proper values for jobs  
							
							
							
						 
						
							2020-04-22 13:28:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f719a5b23a 
								
							 
						 
						
							
							
								
								WebPush: Return proper values for jobs.  
							
							
							
						 
						
							2020-04-22 13:28:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								11433cd38d 
								
							 
						 
						
							
							
								
								Add OpenAPI schema for FlakeID  
							
							
							
						 
						
							2020-04-21 23:54:45 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0238d010a 
								
							 
						 
						
							
							
								
								Improve OpenAPI schema  
							
							... 
							
							
							
							- Removes unneeded wrapping in examples
- Adds `:format` attributes 
							
						 
						
							2020-04-21 23:30:24 +04: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 
								
							 
						 
						
							
							
							
							
								
							
							
								3c828016d9 
								
							 
						 
						
							
							
								
								Merge branch 'openapi/custom-emojis' into 'develop'  
							
							... 
							
							
							
							Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375  
							
						 
						
							2020-04-21 10:13:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bb5d0eafa4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-04-21 08:20:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e57c1b60e4 
								
							 
						 
						
							
							
								
								Merge branch 'accept-deletes' into 'develop'  
							
							... 
							
							
							
							Always accept deletions through SimplePolicy, add :reject_deletes group
See merge request pleroma/pleroma!2371  
							
						 
						
							2020-04-20 18:30:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7e456ac7f6 
								
							 
						 
						
							
							
								
								Merge branch 'router-cleanup' into 'develop'  
							
							... 
							
							
							
							Cleanup and DRY the Router
See merge request pleroma/pleroma!2406  
							
						 
						
							2020-04-20 18:29:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bedc558809 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into accept-deletes  
							
							
							
						 
						
							2020-04-20 10:15:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b54c8813d6 
								
							 
						 
						
							
							
								
								Add :reject_deletes option to SimplePolicy  
							
							
							
						 
						
							2020-04-20 10:11:06 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								258d897579 
								
							 
						 
						
							
							
								
								Cleanup and DRY the Router  
							
							
							
						 
						
							2020-04-20 16:39:20 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6cda360fea 
								
							 
						 
						
							
							
								
								don't restart postgrex  
							
							
							
						 
						
							2020-04-17 12:45:13 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								d8142ee6fe 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1694-transfer-task-fix' into 'develop'  
							
							... 
							
							
							
							Fix for logger configuration
Closes  #1694 
See merge request pleroma/pleroma!2396  
							
						 
						
							2020-04-17 09:02:10 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								304ea09f4c 
								
							 
						 
						
							
							
								
								fix for logger configuration  
							
							
							
						 
						
							2020-04-17 08:42:48 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								77ee64b993 
								
							 
						 
						
							
							
								
								user: remove blank?  
							
							
							
						 
						
							2020-04-16 17:54:57 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								b1c1d2e5e1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1659-rate-limiter' into 'develop'  
							
							... 
							
							
							
							remote_ip plug adds remote_ip_found flag
Closes  #1659 
See merge request pleroma/pleroma!2390  
							
						 
						
							2020-04-15 15:26:55 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22bde21c4f 
								
							 
						 
						
							
							
								
								remote_ip plug adds remote_ip_found flag  
							
							
							
						 
						
							2020-04-15 15:27:34 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6bc76df287 
								
							 
						 
						
							
							
								
								Uploads: Sandbox them in the CSP.  
							
							
							
						 
						
							2020-04-15 12:05:22 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e623c11c 
								
							 
						 
						
							
							
								
								[ #1364 ] Resolved merge conflicts with develop.  
							
							
							
						 
						
							2020-04-14 20:19:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0cda80f266 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/notification.ex 
							
						 
						
							2020-04-14 20:10:02 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								bf3afbc1a1 
								
							 
						 
						
							
							
								
								Merge branch 'logger-configuration' into 'develop'  
							
							... 
							
							
							
							Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365  
							
						 
						
							2020-04-14 15:11:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5fc6ce30ac 
								
							 
						 
						
							
							
								
								Merge branch 'chore/spelling' into 'develop'  
							
							... 
							
							
							
							Fix spelling in log message
See merge request pleroma/pleroma!2378  
							
						 
						
							2020-04-14 13:07:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2eae5793cd 
								
							 
						 
						
							
							
								
								Merge branch 'fix/issue_1679' into 'develop'  
							
							... 
							
							
							
							[#1679 ] fixed  logs
See merge request pleroma/pleroma!2379  
							
						 
						
							2020-04-14 11:08:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								650853fc89 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/notification.ex 
							
						 
						
							2020-04-14 11:58:38 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c4e7ed660c 
								
							 
						 
						
							
							
								
								fix logger message  
							
							
							
						 
						
							2020-04-14 08:43:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f3725b8fc4 
								
							 
						 
						
							
							
								
								Fix spelling  
							
							
							
						 
						
							2020-04-13 17:04:43 -05: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c28aaf9d82 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for CustomEmojiController  
							
							
							
						 
						
							2020-04-13 21:21:04 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa958a6dda 
								
							 
						 
						
							
							
								
								Add spec for AccountController.unfollow  
							
							
							
						 
						
							2020-04-13 18:17:08 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								854780c72b 
								
							 
						 
						
							
							
								
								Add spec for AccountController.follow  
							
							
							
						 
						
							2020-04-13 18:17:08 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b680a98ae 
								
							 
						 
						
							
							
								
								Add spec for AccountController.lists  
							
							
							
						 
						
							2020-04-13 18:17:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e105cc12b6 
								
							 
						 
						
							
							
								
								Add spec for AccountController.following  
							
							
							
						 
						
							2020-04-13 18:17:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bd6e2b300f 
								
							 
						 
						
							
							
								
								Add spec for AccountController.followers  
							
							
							
						 
						
							2020-04-13 18:17:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								03124c96cc 
								
							 
						 
						
							
							
								
								Add spec for AccountController.statuses  
							
							
							
						 
						
							2020-04-13 18:17:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								278b3fa0ad 
								
							 
						 
						
							
							
								
								Add spec for AccountController.show  
							
							
							
						 
						
							2020-04-13 18:16:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d7d6a83233 
								
							 
						 
						
							
							
								
								Add spec for AccountController.relationships  
							
							
							
						 
						
							2020-04-13 18:16:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab400b2ddb 
								
							 
						 
						
							
							
								
								Add specs for ActorType and VisibilityScope  
							
							
							
						 
						
							2020-04-13 18:16:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								260cbddc94 
								
							 
						 
						
							
							
								
								Add spec for AccountController.update_credentials  
							
							
							
						 
						
							2020-04-13 18:16:07 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f80116125f 
								
							 
						 
						
							
							
								
								Add spec for AccountController.verify_credentials  
							
							
							
						 
						
							2020-04-13 17:38:59 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b08ded6c2f 
								
							 
						 
						
							
							
								
								Add spec for AccountController.create  
							
							
							
						 
						
							2020-04-13 17:38:59 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								99b0bc1989 
								
							 
						 
						
							
							
								
								[ #1364 ] Resolved merge conflicts with develop. Refactoring.  
							
							
							
						 
						
							2020-04-13 13:24:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f00ff20768 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/following_relationship.ex 
							
						 
						
							2020-04-13 09:23:50 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a050f3e015 
								
							 
						 
						
							
							
								
								fix for logger configuration through admin-fe  
							
							
							
						 
						
							2020-04-13 08:56:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c5c09fc61b 
								
							 
						 
						
							
							
								
								fix mediaType of object  
							
							
							
						 
						
							2020-04-13 07:02:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a3c74b244 
								
							 
						 
						
							
							
								
								Always accept deletions through SimplePolicy  
							
							
							
						 
						
							2020-04-12 20:26:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c556efb761 
								
							 
						 
						
							
							
								
								[ #1364 ] Enabled notifications on followed domain-blocked users' activities.  
							
							
							
						 
						
							2020-04-12 21:53:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7ee35eb9a6 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mix-tasks-failing-otp' into 'develop'  
							
							... 
							
							
							
							Fix mix tasks failing on OTP releases
Closes  #1678 
See merge request pleroma/pleroma!2369  
							
						 
						
							2020-04-12 16:00:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2ba754ffe1 
								
							 
						 
						
							
							
								
								Fix mix tasks failing on OTP releases  
							
							... 
							
							
							
							No idea why this was even added.
Closes  #1678  
							
						 
						
							2020-04-12 18:49:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5e365448f3 
								
							 
						 
						
							
							
								
								Merge branch 'following-relationships-optimizations' into 'develop'  
							
							... 
							
							
							
							FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332  
							
						 
						
							2020-04-11 19:46:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c077ad0b33 
								
							 
						 
						
							
							
								
								Remove User.upgrade_changeset in favor of remote_user_creation  
							
							... 
							
							
							
							The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior. 
							
						 
						
							2020-04-11 22:31:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								88b16fdfb7 
								
							 
						 
						
							
							
								
								[ #1364 ] Disabled notifications on activities from blocked domains.  
							
							
							
						 
						
							2020-04-11 16:01:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf2a0574e7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/support-conversations-pagination  
							
							
							
						 
						
							2020-04-10 14:18:57 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								4d33e0bd50 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/apc2s_upload_activity' into 'develop'  
							
							... 
							
							
							
							bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316  
							
						 
						
							2020-04-10 04:31:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e89078ac2a 
								
							 
						 
						
							
							
								
								User: remove source_data  
							
							
							
						 
						
							2020-04-10 06:20:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3420dec494 
								
							 
						 
						
							
							
								
								Remove User.fields/1  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc 
								
							 
						 
						
							
							
								
								profile emojis in User.emoji instead of source_data  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62656ab259 
								
							 
						 
						
							
							
								
								User: Move inbox & shared_inbox to own fields  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								369c03834c 
								
							 
						 
						
							
							
								
								formatter: Use user.uri instead of user.source_data.uri  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6bed1a284 
								
							 
						 
						
							
							
								
								Types.URI: New  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19eedb3d04 
								
							 
						 
						
							
							
								
								User: Move public_key from source_data to own field  
							
							
							
						 
						
							2020-04-10 06:16:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5628984df4 
								
							 
						 
						
							
							
								
								User: remove source_data use for follower_address and following_address  
							
							
							
						 
						
							2020-04-10 06:16:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d545b883eb 
								
							 
						 
						
							
							
								
								Add /api/v1/notifications/:id/dismiss endpoint  
							
							
							
						 
						
							2020-04-09 17:08:43 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ac672a9d6b 
								
							 
						 
						
							
							
								
								[ #1559 ] Addressed code review requests.  
							
							
							
						 
						
							2020-04-09 15:13:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b87b798ca1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1658-invite-send' into 'develop'  
							
							... 
							
							
							
							Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344  
							
						 
						
							2020-04-09 10:42:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f20a19de85 
								
							 
						 
						
							
							
								
								typo fix  
							
							
							
						 
						
							2020-04-09 13:28:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								1cf0d5ab0d 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex  
							
							
							
						 
						
							2020-04-09 10:17:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								4c60fdcbb1 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex  
							
							
							
						 
						
							2020-04-09 10:17:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d2e21fbc96 
								
							 
						 
						
							
							
								
								Merge branch 'open-api' into 'develop'  
							
							... 
							
							
							
							Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345  
							
						 
						
							2020-04-09 09:48:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								564f3f01ca 
								
							 
						 
						
							
							
								
								Merge branch 'formatter-html-safe' into 'develop'  
							
							... 
							
							
							
							formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357  
							
						 
						
							2020-04-09 09:47:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c401b00c78 
								
							 
						 
						
							
							
								
								ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}  
							
							
							
						 
						
							2020-04-09 04:36:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d067eaa7b3 
								
							 
						 
						
							
							
								
								formatter.ex: Use Phoenix.HTML for mention/hashtag generation  
							
							... 
							
							
							
							Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason. 
							
						 
						
							2020-04-08 22:58:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5739c498c0 
								
							 
						 
						
							
							
								
								fix for gun connections pool  
							
							
							
						 
						
							2020-04-08 18:46:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1a4875adfa 
								
							 
						 
						
							
							
								
								[ #1559 ] Support for "follow_request" notifications (configurable).  
							
							... 
							
							
							
							(Not currently supported by PleromaFE, thus disabled by default). 
							
						 
						
							2020-04-07 21:52:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dd4d10b275 
								
							 
						 
						
							
							
								
								Merge branch 'fix-auto-link-for-profile-fields' into 'develop'  
							
							... 
							
							
							
							Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352  
							
						 
						
							2020-04-07 11:41:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2b7d7bbd2d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-04-07 14:09:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								03eebabe8e 
								
							 
						 
						
							
							
								
								Add Pleroma.Web.ApiSpec.Helpers  
							
							
							
						 
						
							2020-04-06 17:11:00 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d4ab06505 
								
							 
						 
						
							
							
								
								Merge branch 'featureflag/emoji_reactions' into 'develop'  
							
							... 
							
							
							
							Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313  
							
						 
						
							2020-04-06 12:51:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								96ee0aadbf 
								
							 
						 
						
							
							
								
								Merge branch 'improving-test-coverage' into 'develop'  
							
							... 
							
							
							
							Tests for emoji mix task
See merge request pleroma/pleroma!2350  
							
						 
						
							2020-04-06 12:49:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								349b9d86dc 
								
							 
						 
						
							
							
								
								Merge branch 'remake-remodel-2' into 'develop'  
							
							... 
							
							
							
							Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315  
							
						 
						
							2020-04-06 11:59:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								772bc258cd 
								
							 
						 
						
							
							
								
								ObjectID Validator: Refactor.  
							
							
							
						 
						
							2020-04-06 13:53:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e67cde0ed6 
								
							 
						 
						
							
							
								
								Transmogrifier: Refactoring / Renaming.  
							
							
							
						 
						
							2020-04-06 13:46:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b59ac37b2c 
								
							 
						 
						
							
							
								
								tests for emoji mix task  
							
							
							
						 
						
							2020-04-06 11:13:59 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								3fa51f7272 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/views/account_view.ex
#	lib/pleroma/web/mastodon_api/views/status_view.ex 
							
						 
						
							2020-04-02 19:38:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aa78325117 
								
							 
						 
						
							
							
								
								[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.  
							
							
							
						 
						
							2020-04-02 19:23:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0aa24a150b 
								
							 
						 
						
							
							
								
								Add oAuth  
							
							
							
						 
						
							2020-04-02 17:33:23 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								dbcfac11b4 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1276  
							
							
							
						 
						
							2020-04-02 14:47:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								23219e6fb3 
								
							 
						 
						
							
							
								
								Add OpenAPI  
							
							
							
						 
						
							2020-04-01 23:13:08 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2d64500a9d 
								
							 
						 
						
							
							
								
								error improvement for email_invite endpoint  
							
							
							
						 
						
							2020-04-01 20:26:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								98b96e45ab 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-04-01 20:08:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								ef7d2b0f11 
								
							 
						 
						
							
							
								
								Merge branch 'gun' into 'develop'  
							
							... 
							
							
							
							Gun adapter
Closes  #945 
See merge request pleroma/pleroma!1861  
							
						 
						
							2020-04-01 17:05:09 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								037b49c415 
								
							 
						 
						
							
							
								
								Validators: Correct ObjectID filename  
							
							
							
						 
						
							2020-04-01 16:10:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bfec45bf74 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1601-add-new-meta-tag' into 'develop'  
							
							... 
							
							
							
							Restrict remote users from indexing
Closes  #1601 
See merge request pleroma/pleroma!2341  
							
						 
						
							2020-04-01 12:55:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								94ddbe4098 
								
							 
						 
						
							
							
								
								restrict remote users from indexing  
							
							
							
						 
						
							2020-04-01 09:57:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								185520d1b4 
								
							 
						 
						
							
							
								
								Provide known-good user.uri, remove User.profile_url/1  
							
							
							
						 
						
							2020-03-31 23:55:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b30fb1f3bb 
								
							 
						 
						
							
							
								
								User: Fix use of source_data in profile_url/1  
							
							
							
						 
						
							2020-03-31 23:54:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7408f003a6 
								
							 
						 
						
							
							
								
								Use Pleroma.Formatter.linkify instead of AutoLinker.link  
							
							
							
						 
						
							2020-04-01 02:52:30 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c982093cc2 
								
							 
						 
						
							
							
								
								Transmogrifier: Fix BAD code by RINPATCH  
							
							
							
						 
						
							2020-03-31 19:33:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1b323ce1c6 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2020-03-31 17:28:18 +00:00