Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fb056ce05b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/discoverable_user_field  
							
							
							
						 
						
							2020-10-15 16:39:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8bacdc3680 
								
							 
						 
						
							
							
								
								Change user.discoverable field to user.is_discoverable  
							
							
							
						 
						
							2020-10-13 09:45:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9968b7efed 
								
							 
						 
						
							
							
								
								Change user.locked field to user.is_locked  
							
							
							
						 
						
							2020-10-13 09:31:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b3a9ba09ec 
								
							 
						 
						
							
							
								
								More robust expires_at timestamp processing  
							
							
							
						 
						
							2020-09-29 12:27:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								de993b856b 
								
							 
						 
						
							
							
								
								added force option to the unfollow operation  
							
							
							
						 
						
							2020-09-28 09:16:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f3a1f9c3bb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/bulk-confirmation  
							
							
							
						 
						
							2020-09-23 11:56:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ed3bc53fa1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/2099  
							
							
							
						 
						
							2020-09-18 22:13:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								f2ef9735c5 
								
							 
						 
						
							
							
								
								Federate data through persistent websocket connections  
							
							
							
						 
						
							2020-09-18 11:58:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b867f9d7ae 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/2099  
							
							
							
						 
						
							2020-09-17 08:41:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7a88b726bf 
								
							 
						 
						
							
							
								
								User: Remote users don't need to be confirmed or approved  
							
							
							
						 
						
							2020-09-16 17:29:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								599f8bb152 
								
							 
						 
						
							
							
								
								RepoStreamer.chunk_stream ->  Repo.chunk_stream  
							
							
							
						 
						
							2020-09-16 09:47:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								eb5ff715f7 
								
							 
						 
						
							
							
								
								pin/unpin for activities with expires_at option  
							
							
							
						 
						
							2020-09-10 21:50:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d23d0c27c2 
								
							 
						 
						
							
							
								
								Handle possibility of user account in a bulk operation not having an email address  
							
							
							
						 
						
							2020-09-08 16:48:54 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								75b6fef25d 
								
							 
						 
						
							
							
								
								Add mix task for bulk [un]confirming the local instance users  
							
							
							
						 
						
							2020-09-08 16:39:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								947ee55ae2 
								
							 
						 
						
							
							
								
								user: harden get_friends_query(), get_followers_query() and their wrappers  
							
							
							
						 
						
							2020-09-08 20:21:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5ae56aafb2 
								
							 
						 
						
							
							
								
								added import mutes  
							
							
							
						 
						
							2020-09-06 21:42:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								126461942b 
								
							 
						 
						
							
							
								
								User table: ensure bio is always a string  
							
							... 
							
							
							
							Gets rid of '|| ""' in multiple places and fixes  #2067  
							
						 
						
							2020-09-01 10:45:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dc275b69b 
								
							 
						 
						
							
							
								
								relay fix for admin-fe  
							
							
							
						 
						
							2020-08-19 08:41:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72cbe20a58 
								
							 
						 
						
							
							
								
								Purge most user fields upon deletion, "right to be forgotten"  #859  
							
							
							
						 
						
							2020-08-17 23:44:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c12c576ee2 
								
							 
						 
						
							
							
								
								Also purge bio and display name  
							
							
							
						 
						
							2020-08-17 22:11:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d55faa2f8f 
								
							 
						 
						
							
							
								
								Purge a local user upon deletion,  fixes   #2062  
							
							
							
						 
						
							2020-08-17 21:52:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								95529ab709 
								
							 
						 
						
							
							
								
								[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).  
							
							
							
						 
						
							2020-08-14 20:55:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								474147a67a 
								
							 
						 
						
							
							
								
								Make a new function instead of overloading register_changeset/3  
							
							
							
						 
						
							2020-08-07 14:54:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2a4bca5bd7 
								
							 
						 
						
							
							
								
								Comments are good when they're precise...  
							
							
							
						 
						
							2020-08-05 11:40:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								81126b0142 
								
							 
						 
						
							
							
								
								Add email to user account only if it exists in LDAP  
							
							
							
						 
						
							2020-08-05 11:36:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2192d1e492 
								
							 
						 
						
							
							
								
								Permit LDAP users to register without capturing their password hash  
							
							... 
							
							
							
							We don't need it, and local auth fallback has been removed. 
							
						 
						
							2020-08-05 10:07:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								28584bb224 
								
							 
						 
						
							
							
								
								Merge branch 'email-blacklist' into 'develop'  
							
							... 
							
							
							
							Add email blacklist, fixes  #1404 
Closes  #1404 
See merge request pleroma/pleroma!2837  
							
						 
						
							2020-08-04 11:00:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f57e85ab9 
								
							 
						 
						
							
							
								
								Email blacklist: Update phrasing again  
							
							
							
						 
						
							2020-08-03 22:20:49 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								058daf498f 
								
							 
						 
						
							
							
								
								Email blacklist: Update response phrasing  
							
							
							
						 
						
							2020-08-03 19:57:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc88b6f091 
								
							 
						 
						
							
							
								
								Add email blacklist,  fixes   #1404  
							
							
							
						 
						
							2020-08-02 14:53:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								f671d7e68c 
								
							 
						 
						
							
							
								
								Add welcome chatmessages  
							
							... 
							
							
							
							* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md 
							
						 
						
							2020-08-02 15:54:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f43518eb74 
								
							 
						 
						
							
							
								
								Lint, fix test  
							
							
							
						 
						
							2020-07-27 19:22:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f44a0ee84 
								
							 
						 
						
							
							
								
								Add configurable registration_reason limit  
							
							
							
						 
						
							2020-07-27 15:13:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6747bf2e16 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into by-approval  
							
							
							
						 
						
							2020-07-27 12:29:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6931dbfa58 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into by-approval  
							
							
							
						 
						
							2020-07-26 15:46:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								67ab9a7928 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1934-welcome-email  
							
							
							
						 
						
							2020-07-23 16:36:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								250e0369c7 
								
							 
						 
						
							
							
								
								Merge branch 'issue/1878' into 'develop'  
							
							... 
							
							
							
							[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751  
							
						 
						
							2020-07-23 10:56:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7991ddad58 
								
							 
						 
						
							
							
								
								added warning to use old keys  
							
							
							
						 
						
							2020-07-23 09:01:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								db0224d174 
								
							 
						 
						
							
							
								
								added check user email for welcome email  
							
							
							
						 
						
							2020-07-22 16:00:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3edaecae96 
								
							 
						 
						
							
							
								
								added welcome email  
							
							
							
						 
						
							2020-07-21 09:25:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5756843736 
								
							 
						 
						
							
							
								
								Fully delete users with status :approval_pending  
							
							
							
						 
						
							2020-07-17 12:19:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								48983e9421 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into by-approval  
							
							
							
						 
						
							2020-07-14 18:56:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								df3d1bf5e5 
								
							 
						 
						
							
							
								
								Add :approval_pending to User @type account_status  
							
							
							
						 
						
							2020-07-14 18:56:36 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20d24741af 
								
							 
						 
						
							
							
								
								AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint  
							
							
							
						 
						
							2020-07-14 18:02:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ddf0415c4 
								
							 
						 
						
							
							
								
								Accept reason in POST /api/v1/accounts and store in DB  
							
							
							
						 
						
							2020-07-14 00:22:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								8f9ee694ed 
								
							 
						 
						
							
							
								
								Merge branch 'features/profile-fields-emojo' into 'develop'  
							
							... 
							
							
							
							user: Add support for custom emojis in profile fields
See merge request pleroma/pleroma!2741  
							
						 
						
							2020-07-13 15:43:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bcfd38c8f3 
								
							 
						 
						
							
							
								
								Make a user unapproved when registering with account_approval_required on  
							
							
							
						 
						
							2020-07-12 22:55:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a62f17da17 
								
							 
						 
						
							
							
								
								Add approval_pending field to User  
							
							
							
						 
						
							2020-07-12 20:27:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								62fc8eab0d 
								
							 
						 
						
							
							
								
								fix reset confirmation email in admin section  
							
							
							
						 
						
							2020-07-11 07:20:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b39eb6ecc5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information  
							
							
							
						 
						
							2020-07-10 12:26:53 +02:00