FloatingGhost
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d012ebea1
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'remove/mastofe' into 'develop'"
							
							
							
							
							
							
							
							This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829. 
							
						 | 
						
							2022-01-08 21:44:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sean King
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2e310b3ec8
								
							
						 | 
						
							
							
								
								Fix more build errors
							
							
							
							
							
						 | 
						
							2021-06-04 15:06:55 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								07fed0fda2
								
							
						 | 
						
							
							
								
								Switch to aliasing Router.Helpers instead of importing
							
							
							
							
							
						 | 
						
							2021-05-18 17:45:30 -05: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1b07a2b2b
								
							
						 | 
						
							
							
								
								OAuth form user remembering feature. Local MastoFE login / logout fixes.
							
							
							
							
							
						 | 
						
							2020-11-28 21:51:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								12a5981cc3
								
							
						 | 
						
							
							
								
								Session token setting on token exchange. Auth-related refactoring.
							
							
							
							
							
						 | 
						
							2020-11-25 21:47:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								64553ebae2
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into chore/elixir-1.11
							
							
							
							
							
						 | 
						
							2020-10-13 09:54:53 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4b1863ca4e
								
							
						 | 
						
							
							
								
								RateLimiter module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								636c00037d
								
							
						 | 
						
							
							
								
								Fix duplicate @doc entries
							
							
							
							
							
						 | 
						
							2020-10-07 09:58:45 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								23d5d7cf59
								
							
						 | 
						
							
							
								
								Fix #2172 HTTP error on password reset
							
							
							
							
							
						 | 
						
							2020-09-21 14:09:26 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								43b07c31cb
								
							
						 | 
						
							
							
								
								Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
							
							
							
							
							
							
							
							Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935 
							
						 | 
						
							2020-09-08 13:53:47 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								38f796a5c6
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mastofe-admin-scope' into 'develop'
							
							
							
							
							
							
							
							auth_controller.ex: Add admin scope to MastoFE
See merge request pleroma/pleroma!2256 
							
						 | 
						
							2020-03-13 18:58:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								05da5f5cca
								
							
						 | 
						
							
							
								
								Update Copyrights
							
							
							
							
							
						 | 
						
							2020-03-03 16:44:49 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3ef2ff3e47
								
							
						 | 
						
							
							
								
								auth_controller.ex: Add admin scope to MastoFE
							
							
							
							
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1265 
							
						 | 
						
							2020-02-29 01:25:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steven Fuchs
								
							 
						 | 
						
							
							
							
							
								
							
							
								94627baa5c
								
							
						 | 
						
							
							
								
								New rate limiter
							
							
							
							
							
						 | 
						
							2019-11-11 12:13:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d3c404af12
								
							
						 | 
						
							
							
								
								Add MastoFEController
							
							
							
							
							
						 | 
						
							2019-10-02 20:36:08 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								af690d1033
								
							
						 | 
						
							
							
								
								Extract auth actions from MastodonAPIController to AuthController
							
							
							
							
							
						 | 
						
							2019-10-01 15:54:45 +07:00 | 
						
						
							
							
							
								
							
							
						 |