lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a912f72a36
								
							
						 | 
						
							
							
								
								Signature: Handle non-ap ids in key ids.
							
							
							
							
							
							
							
							Mastodon and Gab sometimes send the format `acct:name@server`. 
							
						 | 
						
							2020-05-01 15:54:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3370bb0e46
								
							
						 | 
						
							
							
								
								Merge branch 'openapi/notifications' into 'develop'
							
							
							
							
							
							
							
							Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437 
							
						 | 
						
							2020-05-01 13:09:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								607e06c245
								
							
						 | 
						
							
							
								
								Merge branch 'openapi/reports' into 'develop'
							
							
							
							
							
							
							
							Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434 
							
						 | 
						
							2020-05-01 12:48:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								44fbd09709
								
							
						 | 
						
							
							
								
								Merge branch 'issue/1577' into 'develop'
							
							
							
							
							
							
							
							[#1577] fix mediaType of object
See merge request pleroma/pleroma!2372 
							
						 | 
						
							2020-05-01 12:38:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2008fa9c7f
								
							
						 | 
						
							
							
								
								Merge branch 'fix/captcha' into 'develop'
							
							
							
							
							
							
							
							Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438 
							
						 | 
						
							2020-05-01 11:47:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								da4b79a56d
								
							
						 | 
						
							
							
								
								Merge branch 'tests/more-apc2s' into 'develop'
							
							
							
							
							
							
							
							Increase tests on AP C2S
See merge request pleroma/pleroma!2449 
							
						 | 
						
							2020-04-30 22:19:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a81342a234
								
							
						 | 
						
							
							
								
								Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
							
							
							
							
							
							
							
							Dismiss the follow request notification on rejection
See merge request pleroma/pleroma!2447 
							
						 | 
						
							2020-04-30 18:38:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f1523f9acd
								
							
						 | 
						
							
							
								
								Increase tests on AP C2S
							
							
							
							
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954 
							
						 | 
						
							2020-04-30 18:56:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								bef34568f0
								
							
						 | 
						
							
							
								
								Dismiss the follow request notification on rejection
							
							
							
							
							
						 | 
						
							2020-04-30 18:38:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ddb757f743
								
							
						 | 
						
							
							
								
								emoji api packs changes in routes with docs update
							
							
							
							
							
						 | 
						
							2020-04-30 16:09:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								342f55fb92
								
							
						 | 
						
							
							
								
								refactor emoji api with fixes
							
							
							
							
							
						 | 
						
							2020-04-30 15:45:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5839e67eb8
								
							
						 | 
						
							
							
								
								return data only for updated emoji
							
							
							
							
							
						 | 
						
							2020-04-30 15:24:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c4344b7b1
								
							
						 | 
						
							
							
								
								Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
							
							
							
							
							
							
							
							[#1364] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)
See merge request pleroma/pleroma!2367 
							
						 | 
						
							2020-04-30 10:29:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9c1adb35de
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into openapi/notifications
							
							
							
							
							
						 | 
						
							2020-04-30 13:52:07 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1898054da4
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into openapi/reports
							
							
							
							
							
						 | 
						
							2020-04-30 13:51:27 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7b0c8f0fde
								
							
						 | 
						
							
							
								
								Add tests for account registration with captcha enabled and improve errors
							
							
							
							
							
						 | 
						
							2020-04-29 21:26:07 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7bd187bc5e
								
							
						 | 
						
							
							
								
								added test
							
							
							
							
							
						 | 
						
							2020-04-29 08:13:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5238ae3dd3
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for NotificationController
							
							
							
							
							
						 | 
						
							2020-04-28 21:27:54 +04: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								560f2c1979
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for ReportController
							
							
							
							
							
						 | 
						
							2020-04-28 16:50:37 +04: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea5142b94b
								
							
						 | 
						
							
							
								
								convert markdown content to html
							
							
							
							
							
						 | 
						
							2020-04-28 09:32:43 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								af27e4dffd
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/1670-user-count' into 'develop'
							
							
							
							
							
							
							
							Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414 
							
						 | 
						
							2020-04-22 17:37:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5bda09de6
								
							
						 | 
						
							
							
								
								Stats: Use invisible property for filtering.
							
							
							
							
							
						 | 
						
							2020-04-22 19:02:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7fb593d13
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 | 
						
							2020-04-22 20:00:51 +03: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 | 
						
						
							
							
							
								
							
							
						 |