Lain Soykaf
								
							 
						 | 
						
							
							
							
							
								
							
							
								93f64aba78
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
							
							
							
							
							
						 | 
						
							2020-04-30 22:44:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								32b8386ede
								
							
						 | 
						
							
							
								
								DeleteValidator: Don't federate local deletions of remote objects.
							
							
							
							
							
							
							
							Closes #1497 
							
						 | 
						
							2020-04-30 21:23:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								999d639873
								
							
						 | 
						
							
							
								
								ActivityPub: Remove delete function.
							
							
							
							
							
							
							
							This is handled by the common pipeline now. 
							
						 | 
						
							2020-04-30 20:13:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								500f5ec14e
								
							
						 | 
						
							
							
								
								SideEffects: On deletion, reduce the reply count cache
							
							
							
							
							
						 | 
						
							2020-04-30 19:47:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab60ee1776
								
							
						 | 
						
							
							
								
								SideEffects: On deletion, reduce the User note count.
							
							
							
							
							
						 | 
						
							2020-04-30 18:19:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d0dc58e2e
								
							
						 | 
						
							
							
								
								SideEffectsTest: Test streaming.
							
							
							
							
							
						 | 
						
							2020-04-30 18:10:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								315b773dd9
								
							
						 | 
						
							
							
								
								ObjectValidator: Refactor.
							
							
							
							
							
						 | 
						
							2020-04-30 17:58:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4500fdc04c
								
							
						 | 
						
							
							
								
								DeleteValidator: Add internal helper field after validation.
							
							
							
							
							
						 | 
						
							2020-04-30 17:53:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								143353432a
								
							
						 | 
						
							
							
								
								StreamerTest: Separate deletion test.
							
							
							
							
							
						 | 
						
							2020-04-30 17:52:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9bfa51ea9
								
							
						 | 
						
							
							
								
								Credo fixes.
							
							
							
							
							
						 | 
						
							2020-04-30 15:58:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								417eed4a2b
								
							
						 | 
						
							
							
								
								SideEffects: Handle deletions.
							
							
							
							
							
						 | 
						
							2020-04-30 15:57:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1fb383f368
								
							
						 | 
						
							
							
								
								DeleteValidator: Deleting a user is valid.
							
							
							
							
							
						 | 
						
							2020-04-30 15:42:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4dc5302f45
								
							
						 | 
						
							
							
								
								Transmogrifier: Handle incoming deletes for non-user objects.
							
							
							
							
							
						 | 
						
							2020-04-30 15:26:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ddb757f743
								
							
						 | 
						
							
							
								
								emoji api packs changes in routes with docs update
							
							
							
							
							
						 | 
						
							2020-04-30 16:09:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								342f55fb92
								
							
						 | 
						
							
							
								
								refactor emoji api with fixes
							
							
							
							
							
						 | 
						
							2020-04-30 15:45:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								db184a8eb4
								
							
						 | 
						
							
							
								
								DeleteValidator: Mastodon sends unaddressed deletes.
							
							
							
							
							
						 | 
						
							2020-04-30 14:37:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5839e67eb8
								
							
						 | 
						
							
							
								
								return data only for updated emoji
							
							
							
							
							
						 | 
						
							2020-04-30 15:24:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd219ba7e8
								
							
						 | 
						
							
							
								
								Transmogrifier Tests: Extract deletion tests.
							
							
							
							
							
						 | 
						
							2020-04-30 14:14:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								503de4b8df
								
							
						 | 
						
							
							
								
								ObjectValidator: Add validation for Deletes.
							
							
							
							
							
						 | 
						
							2020-04-29 19:09:51 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b8056e69e0
								
							
						 | 
						
							
							
								
								Object Validator Types: Add Recipients.
							
							
							
							
							
						 | 
						
							2020-04-29 19:08:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								908cf22a6c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex 
							
						 | 
						
							2020-04-28 19:56:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								12bb7fc0dc
								
							
						 | 
						
							
							
								
								Merge branch 'openapi/account' into 'develop'
							
							
							
							
							
							
							
							Add OpenAPI specs for AccountController
See merge request pleroma/pleroma!2374 
							
						 | 
						
							2020-04-28 11:57:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9994768312
								
							
						 | 
						
							
							
								
								Merge branch 'mongoose-secure' into 'develop'
							
							
							
							
							
							
							
							mongoose auth endpoint worked for deactivated accounts
See merge request pleroma/pleroma!2432 
							
						 | 
						
							2020-04-28 09:18:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fence
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ff20793e7
								
							
						 | 
						
							
							
								
								formating
							
							
							
							
							
						 | 
						
							2020-04-28 01:29:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								dda65f7799
								
							
						 | 
						
							
							
								
								Move single used schemas to operation schema
							
							
							
							
							
						 | 
						
							2020-04-27 22:55:05 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fence
								
							 
						 | 
						
							
							
							
							
								
							
							
								d607b4d840
								
							
						 | 
						
							
							
								
								mongooseim test: explicitly set password for the deactivated used
							
							
							
							
							
						 | 
						
							2020-04-27 19:32:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fence
								
							 
						 | 
						
							
							
							
							
								
							
							
								935ca2c132
								
							
						 | 
						
							
							
								
								requested changes to mongoose test
							
							
							
							
							
						 | 
						
							2020-04-27 19:16:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2efc00b3cf
								
							
						 | 
						
							
							
								
								Use json_response_and_validate_schema/2 in tests to validate OpenAPI schema
							
							
							
							
							
						 | 
						
							2020-04-27 20:46:52 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fence
								
							 
						 | 
						
							
							
							
							
								
							
							
								5c7cc10917
								
							
						 | 
						
							
							
								
								add tests for deactivated users for mongoose auth
							
							
							
							
							
						 | 
						
							2020-04-27 18:31:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f1ca917bb0
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into openapi/account
							
							
							
							
							
						 | 
						
							2020-04-27 14:33:00 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4139cc547
								
							
						 | 
						
							
							
								
								[#2409] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests.
							
							
							
							
							
						 | 
						
							2020-04-24 22:25:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								8addbd948c
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/announce-race-condition' into 'develop'
							
							
							
							
							
							
							
							Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423 
							
						 | 
						
							2020-04-24 16:58:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c30b3b2dc5
								
							
						 | 
						
							
							
								
								Merge branch 'reply-filtering-refactor' into 'develop'
							
							
							
							
							
							
							
							Reply filtering refactor
See merge request pleroma/pleroma!2424 
							
						 | 
						
							2020-04-24 16:32:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d89cd0a197
								
							
						 | 
						
							
							
								
								Reply Filtering: Refactor.
							
							
							
							
							
						 | 
						
							2020-04-24 18:25:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d862c7156a
								
							
						 | 
						
							
							
								
								Merge branch 'openapi-improvements' into 'develop'
							
							
							
							
							
							
							
							Support validation for inline OpenAPI schema and automatic tests for examples
Closes #1696
See merge request pleroma/pleroma!2421 
							
						 | 
						
							2020-04-24 16:10:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								00e62161f6
								
							
						 | 
						
							
							
								
								[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
							
							
							
							
							
						 | 
						
							2020-04-24 16:52:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6e625a427c
								
							
						 | 
						
							
							
								
								reply filtering
							
							
							
							
							
						 | 
						
							2020-04-24 15:43:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb12585098
								
							
						 | 
						
							
							
								
								Announcements: Prevent race condition.
							
							
							
							
							
						 | 
						
							2020-04-24 14:37:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								bbf8554c97
								
							
						 | 
						
							
							
								
								ActivitPub: Remove like function.
							
							
							
							
							
							
							
							We don't need another way to build likes. 
							
						 | 
						
							2020-04-24 13:48:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f362836742
								
							
						 | 
						
							
							
								
								Support validation for inline OpenAPI schema and automatic tests for examples
							
							
							
							
							
						 | 
						
							2020-04-24 15:16:15 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b5f8d19ee
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/repeating-announce' into 'develop'
							
							
							
							
							
							
							
							CommonAPI: Don't make repeating announces possible
See merge request pleroma/pleroma!2418 
							
						 | 
						
							2020-04-23 12:40:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7d38197894
								
							
						 | 
						
							
							
								
								CommonAPI: Don't make repeating announces possible
							
							
							
							
							
						 | 
						
							2020-04-23 13:33:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								25eec6d72d
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/null-scheduled-at' into 'develop'
							
							
							
							
							
							
							
							StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412 
							
						 | 
						
							2020-04-23 11:22:30 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								850377a7b8
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
							
							
							
							
							
							
							
							SideEffects: Run in transaction.
Closes #1629
See merge request pleroma/pleroma!2417 
							
						 | 
						
							2020-04-22 19:26:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e62173dfc8
								
							
						 | 
						
							
							
								
								SideEffects: Run in transaction.
							
							
							
							
							
							
							
							This fixes race conditions. 
							
						 | 
						
							2020-04-22 18:40:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6c26feed01
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into openapi/account
							
							
							
							
							
						 | 
						
							2020-04-22 20:18:12 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0062116e07
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex 
							
						 | 
						
							2020-04-22 18:51:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								28f8fcf8b0
								
							
						 | 
						
							
							
								
								Merge branch 'fix/follow-and-blocks-import' into 'develop'
							
							
							
							
							
							
							
							Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416 
							
						 | 
						
							2020-04-22 15:46:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								468cc977be
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/following-fix-status-code' into 'develop'
							
							
							
							
							
							
							
							AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413 
							
						 | 
						
							2020-04-22 15:33:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								238058ecae
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
							
							
							
							
							
							
							
							Streamer: Stream boosts to the boosting user.
Closes #1543
See merge request pleroma/pleroma!2415 
							
						 | 
						
							2020-04-22 15:31:51 +00:00 | 
						
						
							
							
							
								
							
							
						 |