Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f868dcf3ac
								
							
						 | 
						
							
							
								
								Ensure consistent behavior between pleroma.user activate/deactivate mix tasks
							
							
							
							
							
						 | 
						
							2021-01-25 10:48:28 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e8da27e14
								
							
						 | 
						
							
							
								
								Provide pleroma.user mix task for both activate and deactivate
							
							
							
							
							
						 | 
						
							2021-01-25 10:36:51 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								28581e03ad
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field
							
							
							
							
							
						 | 
						
							2021-01-18 14:58:21 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c0fe2ea9e
								
							
						 | 
						
							
							
								
								Remove toggle_confirmation; require explicit state change
							
							
							
							
							
							
							
							Also cosmetic changes to make the code clearer 
							
						 | 
						
							2021-01-15 13:11:51 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d36182c088
								
							
						 | 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed
							
							
							
							
							
						 | 
						
							2021-01-15 12:44:41 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								7516660753
								
							
						 | 
						
							
							
								
								Remove toggle_activation
							
							
							
							
							
						 | 
						
							2021-01-15 11:25:32 -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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1e7e4d379
								
							
						 | 
						
							
							
								
								Object: Rework how Object.normalize works
							
							
							
							
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 | 
						
							2021-01-04 13:38:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								80891e83d8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow
							
							
							
							
							
						 | 
						
							2020-12-17 09:05:36 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1436a2fa2d
								
							
						 | 
						
							
							
								
								Merge branch 'stream-follow-updates' into 'develop'
							
							
							
							
							
							
							
							Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183 
							
						 | 
						
							2020-12-09 15:52:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								657002e738
								
							
						 | 
						
							
							
								
								Answer new prompt interactively
							
							
							
							
							
						 | 
						
							2020-12-04 12:07:23 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								35ba48494f
								
							
						 | 
						
							
							
								
								Stream follow updates
							
							
							
							
							
						 | 
						
							2020-12-02 00:18:58 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9546c1444c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow
							
							
							
							
							
						 | 
						
							2020-11-14 19:48:47 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								dc38dc8472
								
							
						 | 
						
							
							
								
								Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
							
							
							
							
							
						 | 
						
							2020-10-13 22:01:27 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								09be8cb336
								
							
						 | 
						
							
							
								
								Credo
							
							
							
							
							
						 | 
						
							2020-10-13 12:49:43 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								409f694e4f
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/locked_user_field
							
							
							
							
							
						 | 
						
							2020-10-13 09:54:29 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6bf85440b3
								
							
						 | 
						
							
							
								
								mix tasks consistency
							
							
							
							
							
						 | 
						
							2020-10-13 16:33:24 +03:00 | 
						
						
							
							
							
								
							
							
						 |