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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1399b82f7b
								
							
						 | 
						
							
							
								
								Create WrapperAuthenticator and simplify Authenticator behaviour
							
							
							
							
							
							
							
							Speeds up recompilation by reducing compile-time cycles 
							
						 | 
						
							2021-06-07 18:18:39 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c56f9de0d
								
							
						 | 
						
							
							
								
								Merge branch 'tests/openapi-everywhere' into 'develop'
							
							
							
							
							
							
							
							Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324 
							
						 | 
						
							2021-06-04 18:53:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87
								
							
						 | 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0
							
							
							
							
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 | 
						
							2021-05-31 16:48:03 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								07fed0fda2
								
							
						 | 
						
							
							
								
								Switch to aliasing Router.Helpers instead of importing
							
							
							
							
							
						 | 
						
							2021-05-18 17:45:30 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								55bdfb075c
								
							
						 | 
						
							
							
								
								OpenAPI: TwitterAPI Util Controller
							
							
							
							
							
						 | 
						
							2021-03-15 06:47:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								65cd9cb638
								
							
						 | 
						
							
							
								
								TwitterAPI: Remove unused read notification function
							
							
							
							
							
						 | 
						
							2021-03-15 06:47:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a22c53810b
								
							
						 | 
						
							
							
								
								Remove deprecated /api/qvitter/statuses/notifications/read
							
							
							
							
							
						 | 
						
							2021-03-15 06:47:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								28581e03ad
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field
							
							
							
							
							
						 | 
						
							2021-01-18 14:58:21 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d36182c088
								
							
						 | 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed
							
							
							
							
							
						 | 
						
							2021-01-15 12:44:41 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebd7d1365b
								
							
						 | 
						
							
							
								
								Make setting user activation status explicit
							
							
							
							
							
						 | 
						
							2021-01-15 11:37:17 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								860b5c7804
								
							
						 | 
						
							
							
								
								Change user.deactivated field to user.is_active
							
							
							
							
							
						 | 
						
							2021-01-15 11:24:46 -06: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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								30ed7b502f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow
							
							
							
							
							
						 | 
						
							2020-11-21 10:23:53 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								11e0d5f9ac
								
							
						 | 
						
							
							
								
								Password Resets: Don't accept tokens above a certain age.
							
							
							
							
							
							
							
							By default, one day 
							
						 | 
						
							2020-11-19 12:27:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c3112fd13a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow
							
							
							
							
							
						 | 
						
							2020-10-13 19:20:00 -05: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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8c993c5f63
								
							
						 | 
						
							
							
								
								FederatingPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a6d8cef33e
								
							
						 | 
						
							
							
								
								OAuthScopesPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fc7151a9c4
								
							
						 | 
						
							
							
								
								more files renamings
							
							
							
							
							
						 | 
						
							2020-10-13 16:38:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								83ae45b000
								
							
						 | 
						
							
							
								
								Preload /api/pleroma/frontend_configurations, fixes #1932
							
							
							
							
							
						 | 
						
							2020-10-12 18:49:37 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6ebec50df6
								
							
						 | 
						
							
							
								
								Refactor User.confirm/1, add more tests
							
							
							
							
							
						 | 
						
							2020-10-12 16:32:34 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bb8c0614ef
								
							
						 | 
						
							
							
								
								Move admin approval email logic into User.post_register_action/1
							
							
							
							
							
						 | 
						
							2020-10-11 21:46:10 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								521e965884
								
							
						 | 
						
							
							
								
								Registration tests
							
							
							
							
							
						 | 
						
							2020-10-11 21:38:01 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b2fed59209
								
							
						 | 
						
							
							
								
								Handle User.post_register_action/1 in steps
							
							
							
							
							
						 | 
						
							2020-10-11 18:52:35 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b867f9d7ae
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/2099
							
							
							
							
							
						 | 
						
							2020-09-17 08:41:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7dd986a563
								
							
						 | 
						
							
							
								
								expire mfa tokens  through Oban
							
							
							
							
							
						 | 
						
							2020-09-10 16:01:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ae56aafb2
								
							
						 | 
						
							
							
								
								added import mutes
							
							
							
							
							
						 | 
						
							2020-09-06 21:42:51 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								cbf7f0e029
								
							
						 | 
						
							
							
								
								Disallow password resets for deactivated accounts.
							
							
							
							
							
							
							
							Ensure all responses to password reset events are identical. 
							
						 | 
						
							2020-09-02 09:09:13 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f688c8df82
								
							
						 | 
						
							
							
								
								Fix User.registration_reason HTML sanitizing issues
							
							
							
							
							
						 | 
						
							2020-07-27 20:36:31 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5e74556703
								
							
						 | 
						
							
							
								
								Sanitize reason param in POST /api/v1/accounts
							
							
							
							
							
						 | 
						
							2020-07-16 20:25:53 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0d004a9d04
								
							
						 | 
						
							
							
								
								Email admins when a new unapproved account is up for review
							
							
							
							
							
						 | 
						
							2020-07-14 20:31:20 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5ddf0415c4
								
							
						 | 
						
							
							
								
								Accept reason in POST /api/v1/accounts and store in DB
							
							
							
							
							
						 | 
						
							2020-07-14 00:22:12 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d23804f191
								
							
						 | 
						
							
							
								
								Use the Pleroma.Config alias
							
							
							
							
							
						 | 
						
							2020-07-09 10:53:51 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								67d92ac7b7
								
							
						 | 
						
							
							
								
								Remove /statusnet/config
							
							
							
							
							
						 | 
						
							2020-06-29 17:00:37 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8693e01799
								
							
						 | 
						
							
							
								
								Fix warning
							
							
							
							
							
						 | 
						
							2020-06-29 16:29:51 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4a306720e8
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into remove-twitter-api
							
							
							
							
							
						 | 
						
							2020-06-29 16:09:49 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									stwf
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b8180d7d1
								
							
						 | 
						
							
							
								
								add status_net/config
							
							
							
							
							
						 | 
						
							2020-06-03 16:34:03 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d15aa9d950
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'remove-twitter-api'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 
							
						 | 
						
							2020-05-16 17:07:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d0c567fbc
								
							
						 | 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
							
							
							
							
							
						 | 
						
							2020-05-07 08:14:54 +00: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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2f77842bd3
								
							
						 | 
						
							
							
								
								Fix account registration when captcha is enabled but not provided
							
							
							
							
							
						 | 
						
							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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7771424a8
								
							
						 | 
						
							
							
								
								Fix blocks import
							
							
							
							
							
						 | 
						
							2020-04-22 19:27:28 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								88b82e5c3e
								
							
						 | 
						
							
							
								
								Fix follow import
							
							
							
							
							
						 | 
						
							2020-04-22 19:27:28 +04:00 | 
						
						
							
							
							
								
							
							
						 |