Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								537ba1c5e0
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field
							
							
							
							
							
						 | 
						
							2021-01-25 09:45:06 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								e759579f97
								
							
						 | 
						
							
							
								
								Active users must be confirmed
							
							
							
							
							
						 | 
						
							2021-01-19 16:39:55 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								28581e03ad
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field
							
							
							
							
							
						 | 
						
							2021-01-18 14:58:21 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								44a86951a3
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into refactor/approval_pending_user_field
							
							
							
							
							
						 | 
						
							2021-01-18 12:05:05 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d36182c088
								
							
						 | 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed
							
							
							
							
							
						 | 
						
							2021-01-15 12:44:41 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd1e5d76ab
								
							
						 | 
						
							
							
								
								Remove User.restrict_deactivated/1
							
							
							
							
							
							
							
							Everything else is in User.Query, no need for this odd kludge. 
							
						 | 
						
							2021-01-15 11:24:46 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								860b5c7804
								
							
						 | 
						
							
							
								
								Change user.deactivated field to user.is_active
							
							
							
							
							
						 | 
						
							2021-01-15 11:24:46 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f7e59c28ed
								
							
						 | 
						
							
							
								
								Change user.approval_pending field to user.is_approved
							
							
							
							
							
						 | 
						
							2021-01-15 10:42:02 -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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								60663150b5
								
							
						 | 
						
							
							
								
								admin user search: added filter by actor_type
							
							
							
							
							
						 | 
						
							2020-10-22 11:53:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								46b420aa60
								
							
						 | 
						
							
							
								
								need_confirmed -> unconfirmed
							
							
							
							
							
						 | 
						
							2020-10-22 11:50:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ef46ce410
								
							
						 | 
						
							
							
								
								added 'unconfirmed' filter to admin/users
							
							
							
							
							
						 | 
						
							2020-10-22 11:50:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3a1f9c3bb
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/bulk-confirmation
							
							
							
							
							
						 | 
						
							2020-09-23 11:56:22 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0e0ece251a
								
							
						 | 
						
							
							
								
								Filter out internal users by default
							
							
							
							
							
						 | 
						
							2020-09-22 16:56:11 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								75b6fef25d
								
							
						 | 
						
							
							
								
								Add mix task for bulk [un]confirming the local instance users
							
							
							
							
							
						 | 
						
							2020-09-08 16:39:41 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								23ca5f75af
								
							
						 | 
						
							
							
								
								Make it possible to bulk send confirmation emails to all unconfirmed users
							
							
							
							
							
						 | 
						
							2020-09-08 16:39:08 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								249f21dcbb
								
							
						 | 
						
							
							
								
								Admin API: Filter out unapproved users when the active filter is on
							
							
							
							
							
						 | 
						
							2020-08-10 18:27:39 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								33f1b29b2c
								
							
						 | 
						
							
							
								
								AdminAPI: Filter users by need_approval
							
							
							
							
							
						 | 
						
							2020-07-14 14:29:03 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								165a4b2a69
								
							
						 | 
						
							
							
								
								Do not include activities of invisible users unless explicitly requested
							
							
							
							
							
							
							
							Closes #1833 
							
						 | 
						
							2020-06-02 13:34:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								be322541c8
								
							
						 | 
						
							
							
								
								User.Query: Remove superfluous distinct
							
							
							
							
							
						 | 
						
							2020-05-19 14:36:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a985bd57b4
								
							
						 | 
						
							
							
								
								User.Query: Speed up recipients query.
							
							
							
							
							
						 | 
						
							2020-05-19 14:11:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ecf37b46d2
								
							
						 | 
						
							
							
								
								pagination fix for service users filters
							
							
							
							
							
						 | 
						
							2020-05-01 14:31:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6e625a427c
								
							
						 | 
						
							
							
								
								reply filtering
							
							
							
							
							
						 | 
						
							2020-04-24 15:43:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								be9d18461a
								
							
						 | 
						
							
							
								
								FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).
							
							
							
							
							
						 | 
						
							2020-03-28 18:49:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07
							
							
							
							
							
							
							
							Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' 
							
						 | 
						
							2020-03-02 06:08:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								22018adae6
								
							
						 | 
						
							
							
								
								Fix Dialyzer warnings
							
							
							
							
							
						 | 
						
							2020-02-25 18:34:56 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kPherox
								
							 
						 | 
						
							
							
							
							
								
							
							
								363e76d4da
								
							
						 | 
						
							
							
								
								Fix duplicate recipients
							
							
							
							
							
						 | 
						
							2019-10-30 15:40:25 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c1dd55c48
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
							
							
							
							
							
						 | 
						
							2019-10-24 14:55:36 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82
								
							
						 | 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship
							
							
							
							
							
						 | 
						
							2019-10-11 02:35:32 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								447514dfa2
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed in 2019
							
							
							
							
							
							
							
							Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' 
							
						 | 
						
							2019-09-18 23:21:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6b0fce6e9
								
							
						 | 
						
							
							
								
								Fix/1019 correct count remote users
							
							
							
							
							
						 | 
						
							2019-07-09 17:36:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								b92c004ea8
								
							
						 | 
						
							
							
								
								Reuse query from User.restrict_deactivated/1
							
							
							
							
							
						 | 
						
							2019-05-14 18:29:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e2b491276
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
							
							
							
							
							
						 | 
						
							2019-05-14 18:15:56 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bfeb33e951
								
							
						 | 
						
							
							
								
								Merge develop
							
							
							
							
							
							
							
							Merge conflict in lib/pleroma/activity.ex 
							
						 | 
						
							2019-05-08 14:34:36 +00:00 | 
						
						
							
							
							
								
							
							
						 |