marcin mikołajczak
								
							 
						 | 
						
							
							
							
							
								
							
							
								1657db656c
								
							
						 | 
						
							
							
								
								AccountController.lookup: skip auth
							
							
							
							
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 | 
						
							2021-12-28 20:02:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									marcin mikołajczak
								
							 
						 | 
						
							
							
							
							
								
							
							
								0dd1caa841
								
							
						 | 
						
							
							
								
								AccountController.lookup: skip visibility check
							
							
							
							
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 | 
						
							2021-12-28 18:24:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									marcin mikołajczak
								
							 
						 | 
						
							
							
							
							
								
							
							
								746c9daa62
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
							
							
							
							
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 | 
						
							2021-12-28 16:27:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									marcin mikołajczak
								
							 
						 | 
						
							
							
							
							
								
							
							
								f734579965
								
							
						 | 
						
							
							
								
								MastoAPI: Add GET /api/v1/accounts/lookup
							
							
							
							
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 | 
						
							2021-12-28 16:11:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								588bcbac55
								
							
						 | 
						
							
							
								
								Apply 2 suggestion(s) to 2 file(s)
							
							
							
							
							
						 | 
						
							2021-11-22 10:54:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									marcin mikołajczak
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e040e098b
								
							
						 | 
						
							
							
								
								Lint
							
							
							
							
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 | 
						
							2021-11-21 18:17:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									marcin mikołajczak
								
							 
						 | 
						
							
							
							
							
								
							
							
								40414bf177
								
							
						 | 
						
							
							
								
								MastoAPI: Add user notes on accounts
							
							
							
							
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 | 
						
							2021-11-21 16:56:26 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								45b7325b9e
								
							
						 | 
						
							
							
								
								Refactor skipped plugs into Pleroma.Web functions
							
							
							
							
							
							
							
							Speeds up recompilation by reducing compile cycles 
							
						 | 
						
							2021-06-08 19:15:04 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
							
							
								
							
							
								b99f60615c
								
							
						 | 
						
							
							
								
								Fix order of Pleroma.Web.Utils.Params aliases
							
							
							
							
							
						 | 
						
							2021-06-08 12:50:47 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec65b7ae29
								
							
						 | 
						
							
							
								
								Pleroma.Web.Params --> Pleroma.Web.Utils.Params
							
							
							
							
							
						 | 
						
							2021-06-08 12:50:47 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
							
							
								
							
							
								0877b120c3
								
							
						 | 
						
							
							
								
								Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
							
							
							
							
							
							
							
							Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex 
							
						 | 
						
							2021-06-08 12:50:47 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c369d2b930
								
							
						 | 
						
							
							
								
								support for with_relationships parameter
							
							
							
							
							
							
							
							in /api/v1/mutes and /api/v1/accounts/:id endpoints 
							
						 | 
						
							2021-01-29 08:41:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f
								
							
						 | 
						
							
							
								
								Bump Copyright to 2021
							
							
							
							
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;' 
							
						 | 
						
							2021-01-13 07:49:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cbce880076
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into aliases
							
							
							
							
							
						 | 
						
							2020-12-30 17:10:02 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								12a5981cc3
								
							
						 | 
						
							
							
								
								Session token setting on token exchange. Auth-related refactoring.
							
							
							
							
							
						 | 
						
							2020-11-25 21:47:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e164c37139
								
							
						 | 
						
							
							
								
								[#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.
							
							
							
							
							
						 | 
						
							2020-11-19 19:30:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb41bd1a85
								
							
						 | 
						
							
							
								
								Hide reactions from muted and blocked users
							
							
							
							
							
						 | 
						
							2020-11-16 22:50:14 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd2b3a8da9
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
							
							
							
							
							
						 | 
						
							2020-11-04 16:51:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								76c4e80e5a
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into mutes-blocks-pagination
							
							
							
							
							
						 | 
						
							2020-10-19 15:40:03 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb056ce05b
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/discoverable_user_field
							
							
							
							
							
						 | 
						
							2020-10-15 16:39:01 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								83770b7b39
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into aliases
							
							
							
							
							
						 | 
						
							2020-10-14 12:33:24 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed61002815
								
							
						 | 
						
							
							
								
								Undo API breaking changes
							
							
							
							
							
						 | 
						
							2020-10-14 11:03:17 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								b001237b79
								
							
						 | 
						
							
							
								
								Finish undoing API breakage
							
							
							
							
							
						 | 
						
							2020-10-14 10:44:18 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7d8f610720
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into aliases
							
							
							
							
							
						 | 
						
							2020-10-13 19:25:18 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6734abcbd4
								
							
						 | 
						
							
							
								
								Add pagination for Mutes
							
							
							
							
							
						 | 
						
							2020-10-13 21:58:18 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								33f4f39b1c
								
							
						 | 
						
							
							
								
								Add pagination for Blocks
							
							
							
							
							
						 | 
						
							2020-10-13 21:39:41 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								409f694e4f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/locked_user_field
							
							
							
							
							
						 | 
						
							2020-10-13 09:54:29 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ead0d564f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/discoverable_user_field
							
							
							
							
							
						 | 
						
							2020-10-13 09:54:11 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8bacdc3680
								
							
						 | 
						
							
							
								
								Change user.discoverable field to user.is_discoverable
							
							
							
							
							
						 | 
						
							2020-10-13 09:45:08 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								9968b7efed
								
							
						 | 
						
							
							
								
								Change user.locked field to user.is_locked
							
							
							
							
							
						 | 
						
							2020-10-13 09:31:13 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1d0e130cb3
								
							
						 | 
						
							
							
								
								fixes after rebase
							
							
							
							
							
						 | 
						
							2020-10-13 16:44:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9f4fe5485b
								
							
						 | 
						
							
							
								
								alias alphabetically order
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								011525a3d1
								
							
						 | 
						
							
							
								
								EnsurePublicOrAuthenticatedPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a6d8cef33e
								
							
						 | 
						
							
							
								
								OAuthScopesPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4b1863ca4e
								
							
						 | 
						
							
							
								
								RateLimiter module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								77b1ea68a7
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into aliases
							
							
							
							
							
						 | 
						
							2020-10-08 15:44:48 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c56e3d4f3b
								
							
						 | 
						
							
							
								
								Add expires_in param for account mutes
							
							
							
							
							
						 | 
						
							2020-09-08 13:26:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								66122a11b5
								
							
						 | 
						
							
							
								
								AccountController: Build the correct update activity.
							
							
							
							
							
							
							
							Will fix federation issues. 
							
						 | 
						
							2020-08-10 10:33:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4af1b80381
								
							
						 | 
						
							
							
								
								Clean up account aliases
							
							
							
							
							
						 | 
						
							2020-08-07 17:37:15 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								27b0a8b155
								
							
						 | 
						
							
							
								
								[#1985] Prevented force login on registration if account approval and/or email confirmation needed.
							
							
							
							
							
							
							
							Refactored login code in OAuthController, reused in AccountController. Added tests. 
							
						 | 
						
							2020-07-31 14:13:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c25c21dd22
								
							
						 | 
						
							
							
								
								AccountController: Don't explicitly ask to keep users unconfirmed.
							
							
							
							
							
							
							
							Confirmation is set in User.register_changeset based on the config
settings. 
							
						 | 
						
							2020-07-29 11:47:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b39eb6ecc5
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
							
							
							
							
							
						 | 
						
							2020-07-10 12:26:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8ca1f3e8c6
								
							
						 | 
						
							
							
								
								Merge branch '1723-token-fixes' into 'develop'
							
							
							
							
							
							
							
							AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694 
							
						 | 
						
							2020-07-09 13:10:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0385cf47a
								
							
						 | 
						
							
							
								
								AccountController: Fix muting / unmuting reblogs.
							
							
							
							
							
						 | 
						
							2020-07-08 11:52:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								59cf78e412
								
							
						 | 
						
							
							
								
								AccountController: Allow removal / reset of user images.
							
							
							
							
							
						 | 
						
							2020-07-07 16:53:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3b5559780
								
							
						 | 
						
							
							
								
								AccountController: Make setting accepts_chat_messages possible.
							
							
							
							
							
						 | 
						
							2020-07-03 15:54:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								59540131c1
								
							
						 | 
						
							
							
								
								Credo fixes.
							
							
							
							
							
						 | 
						
							2020-06-29 14:09:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e374872fe7
								
							
						 | 
						
							
							
								
								AccountOperation: Correctly describe create response.
							
							
							
							
							
						 | 
						
							2020-06-29 13:49:48 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f378e93bf4
								
							
						 | 
						
							
							
								
								AccountController: Return scope in proper format.
							
							
							
							
							
						 | 
						
							2020-06-26 16:15:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8cfb58a8c0
								
							
						 | 
						
							
							
								
								AccountController: Extract blocking to CommonAPI.
							
							
							
							
							
						 | 
						
							2020-06-25 11:44:04 +02:00 | 
						
						
							
							
							
								
							
							
						 |