Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3920244be5 
								
							 
						 
						
							
							
								
								[ #1427 ] Fixed :admin option handling in OAuthScopesPlug, added tests.  
							
							
							
						 
						
							2019-12-11 11:42:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								835ac2157c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2019-12-10 08:55:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3c45ed4f47 
								
							 
						 
						
							
							
								
								OTP: Fix runtime upload limit config being ignored  
							
							... 
							
							
							
							Closes  #1109  
						
							2019-12-08 21:08:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1770602747 
								
							 
						 
						
							
							
								
								[ #1427 ] Extra check that admin OAuth scope is used by admin. Adjusted tests.  
							
							
							
						 
						
							2019-12-07 17:49:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								40e1817f70 
								
							 
						 
						
							
							
								
								[ #1427 ] Fixes / improvements of admin scopes support. Added tests.  
							
							
							
						 
						
							2019-12-06 20:33:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								93a80ee915 
								
							 
						 
						
							
							
								
								[ #1427 ] Bugfix for enforce_oauth_admin_scope_usage. Admin API documentation entry.  
							
							
							
						 
						
							2019-12-06 16:56:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								af42c00cff 
								
							 
						 
						
							
							
								
								[ #1427 ] Reworked admin scopes support.  
							
							... 
							
							
							
							Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s). 
							
						 
						
							2019-12-06 00:25:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								36686f5245 
								
							 
						 
						
							
							
								
								Support authentication via x-admin-token HTTP header  
							
							
							
						 
						
							2019-11-19 15:58:20 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								22554ac5ca 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1395-email-activation' into 'develop'  
							
							... 
							
							
							
							Bugfix/1395 email activation
Closes  #1395 
See merge request pleroma/pleroma!1965  
							
						 
						
							2019-11-15 14:11:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f17e0f8e4f 
								
							 
						 
						
							
							
								
								OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug  
							
							
							
						 
						
							2019-11-15 14:13:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								2cc043591c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/static-fe' into 'develop'  
							
							... 
							
							
							
							Static frontend
See merge request pleroma/pleroma!1917  
							
						 
						
							2019-11-11 19:10:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								94627baa5c 
								
							 
						 
						
							
							
								
								New rate limiter  
							
							
							
						 
						
							2019-11-11 12:13:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f6056e9c9c 
								
							 
						 
						
							
							
								
								UserEnabledPlug: Don't authenticate unconfirmed users.  
							
							
							
						 
						
							2019-11-11 12:43:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Hagelberg 
								
							 
						 
						
							
							
							
							
								
							
							
								886a07ba57 
								
							 
						 
						
							
							
								
								Move static_fe config to its own section instead of in :instance.  
							
							
							
						 
						
							2019-11-09 18:08:45 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Hagelberg 
								
							 
						 
						
							
							
							
							
								
							
							
								8969c5522d 
								
							 
						 
						
							
							
								
								Make many of the improvements suggested in review.  
							
							
							
						 
						
							2019-11-09 18:08:08 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Hagelberg 
								
							 
						 
						
							
							
							
							
								
							
							
								e8bee35578 
								
							 
						 
						
							
							
								
								Static FE plug should only respond to text/html requests.  
							
							
							
						 
						
							2019-11-09 18:08:08 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Hagelberg 
								
							 
						 
						
							
							
							
							
								
							
							
								dc3b87d153 
								
							 
						 
						
							
							
								
								Move static FE routing into its own plug.  
							
							... 
							
							
							
							Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place. 
							
						 
						
							2019-11-09 18:08:08 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								365657320c 
								
							 
						 
						
							
							
								
								Fix TrailingFormatPlug not being active for /api/oauth_tokens  
							
							
							
						 
						
							2019-11-06 17:22:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								64095961fe 
								
							 
						 
						
							
							
								
								[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex 
							
						 
						
							2019-10-02 20:42:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								f9380289eb 
								
							 
						 
						
							
							
								
								Add remote_ip plug  
							
							
							
						 
						
							2019-09-27 21:59:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e4f3d7f69d 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex  
							
							
							
						 
						
							2019-09-18 10:31:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								01c1078015 
								
							 
						 
						
							
							
								
								[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex 
							
						 
						
							2019-09-17 22:53:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								efbc2edba1 
								
							 
						 
						
							
							
								
								[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
#	lib/pleroma/web/router.ex 
							
						 
						
							2019-09-15 18:52:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e6f43a831b 
								
							 
						 
						
							
							
								
								[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).  
							
							
							
						 
						
							2019-09-15 18:22:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b0e6058021 
								
							 
						 
						
							
							
								
								Parse http signature for request to objects/activities  
							
							
							
						 
						
							2019-09-12 23:03:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dabc4a00f5 
								
							 
						 
						
							
							
								
								Put the cache with the right key when using a tracking function  
							
							
							
						 
						
							2019-09-12 22:10:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								769fb778d4 
								
							 
						 
						
							
							
								
								Track object/create activity fetches  
							
							
							
						 
						
							2019-09-12 21:37:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								11e12b5761 
								
							 
						 
						
							
							
								
								Add Pleroma.Plugs.Cache  
							
							
							
						 
						
							2019-09-09 18:53:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b63faf9819 
								
							 
						 
						
							
							
								
								[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).  
							
							
							
						 
						
							2019-09-08 15:00:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3523bdcf26 
								
							 
						 
						
							
							
								
								Call TrailingFormatPlug for /api/pleroma/emoji  
							
							... 
							
							
							
							Apparently Pleroma-FE still calls it with trailing '.json' 
							
						 
						
							2019-09-05 22:21:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cc1d1ee406 
								
							 
						 
						
							
							
								
								Mastdon API: Add ability to get a remote account by nickname to  
							
							... 
							
							
							
							`/api/v1/accounts/:id` 
							
						 
						
							2019-09-03 19:26:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								55341ac717 
								
							 
						 
						
							
							
								
								tests WebFinger  
							
							
							
						 
						
							2019-07-24 15:13:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								716afc83ce 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/http-signature-plug' into 'develop'  
							
							... 
							
							
							
							http signature plug: separation of concerns
See merge request pleroma/pleroma!1449  
							
						 
						
							2019-07-19 16:57:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								c947cfec5a 
								
							 
						 
						
							
							
								
								mapped signature plug: use user assign like authentication plug  
							
							
							
						 
						
							2019-07-18 20:31:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								f435217e50 
								
							 
						 
						
							
							
								
								tests for Plugs.AuthenticationPlug  
							
							
							
						 
						
							2019-07-18 20:29:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								a8af0ac053 
								
							 
						 
						
							
							
								
								mapped signature plug: fix user lookup  
							
							
							
						 
						
							2019-07-18 16:27:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5ea0cd69f7 
								
							 
						 
						
							
							
								
								mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)  
							
							
							
						 
						
							2019-07-18 16:01:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								184fa61fb3 
								
							 
						 
						
							
							
								
								plugs: add MappedSignatureToIdentityPlug  
							
							
							
						 
						
							2019-07-18 15:38:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								88d064d80e 
								
							 
						 
						
							
							
								
								http signature plug: remove redundant checks handled by HTTPSignatures library  
							
							... 
							
							
							
							the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests.  but now, the adapter has been corrected. 
							
						 
						
							2019-07-18 15:11:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Moonman 
								
							 
						 
						
							
							
							
							
								
							
							
								105f437ce9 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2019-07-15 08:36:51 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Moonman 
								
							 
						 
						
							
							
							
							
								
							
							
								f98f7ad1b9 
								
							 
						 
						
							
							
								
								detect and use sha512-crypt for stored password hash.  
							
							
							
						 
						
							2019-07-14 09:48:42 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								369e9bb42f 
								
							 
						 
						
							
							
								
								[ #1041 ] Rate-limited status actions (per user and per user+status).  
							
							
							
						 
						
							2019-07-13 14:49:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ed8ce21a22 
								
							 
						 
						
							
							
								
								Fix unused import warning  
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a42da8f311 
								
							 
						 
						
							
							
								
								Fix response  
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5104f65b69 
								
							 
						 
						
							
							
								
								Wrap error messages into gettext helpers  
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								0d54a571ca 
								
							 
						 
						
							
							
								
								Add SetLocalePlug  
							
							
							
						 
						
							2019-07-10 18:08:03 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								889a9c3a3f 
								
							 
						 
						
							
							
								
								Polish IdempotencyPlug  
							
							
							
						 
						
							2019-06-27 01:53:58 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								159630b21c 
								
							 
						 
						
							
							
								
								Fix credo warning  
							
							
							
						 
						
							2019-06-26 19:19:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								825077a5b0 
								
							 
						 
						
							
							
								
								Add Idempotency plug  
							
							
							
						 
						
							2019-06-26 18:36:58 +07:00