| 
								
								
									 Egor Kislitsyn | 7e7a3e1544 | Add OpenAPI spec for FilterController | 2020-05-05 17:41:01 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | d08c63500b | Ignore unexpected query params | 2020-05-04 20:16:44 +04: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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | dda65f7799 | Move single used schemas to operation schema | 2020-04-27 22:55:05 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 2efc00b3cf | Use json_response_and_validate_schema/2in tests to validate OpenAPI schema | 2020-04-27 20:46:52 +04: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/favouritesauth-optional, adjusted tests. | 2020-04-24 22:25:27 +03:00 |  | 
				
					
						| 
								
								
									 lain | d89cd0a197 | Reply Filtering: Refactor. | 2020-04-24 18:25:26 +02: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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 2958a7d246 | Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped. | 2020-04-22 18:50:25 +03:00 |  | 
				
					
						| 
								
								
									 lain | 5b39526198 | AccountController: Use code 400 for self-follow. | 2020-04-22 15:04:26 +02:00 |  | 
				
					
						| 
								
								
									 lain | c10485db16 | StatusController: Ignore nil scheduled_at parameters. | 2020-04-22 14:26:19 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | f685cbd309 | Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring. | 2020-04-21 16:29:19 +03:00 |  | 
				
					
						| 
								
								
									 lain | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 rinpatch | badd888ccb | Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349 | 2020-04-16 21:58:57 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 942d7467ca | Merge branch 'develop' into features/remove-user-source_data | 2020-04-16 21:28:52 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | cf4ebba774 | Cleanup SubscriptionController | 2020-04-15 23:14:47 +04:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | bedf92e064 | Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement | 2020-04-15 19:20:34 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 247e6fcb90 | Merge branch 'develop' into openapi/account | 2020-04-14 19:45:22 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 4dca712e90 | Add OpenAPI spec for DomainBlockController | 2020-04-13 22:44:52 +04: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 | 260cbddc94 | Add spec for AccountController.update_credentials | 2020-04-13 18:16:07 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | b08ded6c2f | Add spec for AccountController.create | 2020-04-13 17:38:59 +04: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 |  |