Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d08c63500b
								
							
						 | 
						
							
							
								
								Ignore unexpected query params
							
							
							
							
							
						 | 
						
							2020-05-04 20:16:44 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7b0c8f0fde
								
							
						 | 
						
							
							
								
								Add tests for account registration with captcha enabled and improve errors
							
							
							
							
							
						 | 
						
							2020-04-29 21:26:07 +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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								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/2 in tests to validate OpenAPI schema
							
							
							
							
							
						 | 
						
							2020-04-27 20:46:52 +04: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								736fead494
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into openapi/account
							
							
							
							
							
						 | 
						
							2020-04-20 18:40:02 +04: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc
								
							
						 | 
						
							
							
								
								profile emojis in User.emoji instead of source_data
							
							
							
							
							
						 | 
						
							2020-04-10 06:20:02 +02: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								012d428e1f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
							
							
							
							
							
						 | 
						
							2020-03-25 09:05:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e743c22329
								
							
						 | 
						
							
							
								
								Fixed incorrect usage of "relations" as a short form of "relationships".
							
							
							
							
							
						 | 
						
							2020-03-25 09:04:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d75d0ed7a
								
							
						 | 
						
							
							
								
								Merge branch 'admin-api-change-password' into 'develop'
							
							
							
							
							
							
							
							Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149 
							
						 | 
						
							2020-03-24 17:34:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a6ee6784bc
								
							
						 | 
						
							
							
								
								creating trusted app from adminFE & mix task
							
							
							
							
							
						 | 
						
							2020-03-23 10:44:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fe15f0ba15
								
							
						 | 
						
							
							
								
								restrict_unauthenticated setting
							
							
							
							
							
						 | 
						
							2020-03-20 16:36:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								13cce9c0de
								
							
						 | 
						
							
							
								
								Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.
							
							
							
							
							
						 | 
						
							2020-03-16 20:42:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f446744a6a
								
							
						 | 
						
							
							
								
								Allow account registration without an email
							
							
							
							
							
						 | 
						
							2020-02-26 20:13:53 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								701815e64c
								
							
						 | 
						
							
							
								
								[ActivityPub] Configurable ActivityPub actor type
							
							
							
							
							
						 | 
						
							2019-12-10 13:19:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8cee4d9a0
								
							
						 | 
						
							
							
								
								ActivityPub: For user timelines, respects blocks.
							
							
							
							
							
							
							
							Unless the timeline belongs to a blocked user. 
							
						 | 
						
							2019-12-06 14:25:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								30caf3e51e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/user.ex 
							
						 | 
						
							2019-12-04 18:56:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7722e5a67a
								
							
						 | 
						
							
							
								
								Merge branch 'feature/move-activity' into 'develop'
							
							
							
							
							
							
							
							Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883 
							
						 | 
						
							2019-12-02 16:26:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cad9b325e5
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs 
							
						 | 
						
							2019-11-21 16:47:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8feb5dcb42
								
							
						 | 
						
							
							
								
								Merge branch 'issue/1348' into 'develop'
							
							
							
							
							
							
							
							[#1348] excluded invisible actors from gets  /api/v1/accounts/:id
See merge request pleroma/pleroma!1937 
							
						 | 
						
							2019-11-21 13:13:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba5cc30165
								
							
						 | 
						
							
							
								
								[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
							
							
							
							
							
						 | 
						
							2019-11-19 23:22:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								01d9c093c3
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
							
							
							
							
							
						 | 
						
							2019-11-15 21:40:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c31ddce51e
								
							
						 | 
						
							
							
								
								[#1335] Reorganized users.mutes as relation to UserMute entity.
							
							
							
							
							
						 | 
						
							2019-11-15 21:38:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3c0abfca53
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/move-activity
							
							
							
							
							
						 | 
						
							2019-11-14 16:39:45 +07:00 | 
						
						
							
							
							
								
							
							
						 |