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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								61ef1fca4b 
								
							 
						 
						
							
							
								
								remove duplicate module  
							
							
							
						 
						
							2020-07-24 08:35:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5879d36854 
								
							 
						 
						
							
							
								
								fix sender for welcome email  
							
							
							
						 
						
							2020-07-22 15:34:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3edaecae96 
								
							 
						 
						
							
							
								
								added welcome email  
							
							
							
						 
						
							2020-07-21 09:25:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								33f1b29b2c 
								
							 
						 
						
							
							
								
								AdminAPI: Filter users by need_approval  
							
							
							
						 
						
							2020-07-14 14:29:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								80c21100db 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/notification_settings  
							
							
							
						 
						
							2020-07-13 13:32:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								123352ffa1 
								
							 
						 
						
							
							
								
								Removed unused trigram index on users. Fixed users_fts_index usage.  
							
							
							
						 
						
							2020-07-08 22:50:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								704a383055 
								
							 
						 
						
							
							
								
								Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.  
							
							
							
						 
						
							2020-07-08 13:14:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								90764670dc 
								
							 
						 
						
							
							
								
								[ #1892 ] Excluded internal users (applications) from user search results, reinstated service actors in search results.  
							
							
							
						 
						
							2020-07-03 11:02:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3d2989278c 
								
							 
						 
						
							
							
								
								[ #1892 ] Excluded bot actors (applications, services) from search results.  
							
							
							
						 
						
							2020-06-30 21:26:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								69848d5c97 
								
							 
						 
						
							
							
								
								Rename notification "privacy_option" setting  
							
							
							
						 
						
							2020-06-26 12:45:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fd5e797379 
								
							 
						 
						
							
							
								
								Simplify notification filtering settings further  
							
							
							
						 
						
							2020-06-26 11:24:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								433c01b370 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/notification_settings  
							
							
							
						 
						
							2020-06-25 14:26:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								165a4b2a69 
								
							 
						 
						
							
							
								
								Do not include activities of invisible users unless explicitly requested  
							
							... 
							
							
							
							Closes  #1833  
						
							2020-06-02 13:34:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9eea800026 
								
							 
						 
						
							
							
								
								Refactor notification settings  
							
							
							
						 
						
							2020-05-28 10:16:09 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7803a85d2c 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for StatusController  
							
							
							
						 
						
							2020-05-13 00:25:21 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05da5f5cca 
								
							 
						 
						
							
							
								
								Update Copyrights  
							
							
							
						 
						
							2020-03-03 16:44:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a 
							
						 
						
							2020-03-02 06:08:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22018adae6 
								
							 
						 
						
							
							
								
								Fix Dialyzer warnings  
							
							
							
						 
						
							2020-02-25 18:34:56 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								95e6a2acd9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1342  
							
							
							
						 
						
							2019-12-08 21:25:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								04a8ffbe84 
								
							 
						 
						
							
							
								
								added privacy option to push notifications  
							
							
							
						 
						
							2019-11-28 22:13:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a52da55eb9 
								
							 
						 
						
							
							
								
								added User.NotificationSetting struct  
							
							
							
						 
						
							2019-11-28 22:08:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cad9b325e5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs 
							
						 
						
							2019-11-21 16:47:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aad6576130 
								
							 
						 
						
							
							
								
								[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.  
							
							
							
						 
						
							2019-11-18 20:38:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5cf2c7422b 
								
							 
						 
						
							
							
								
								[ #1335 ] Applied code review suggestions.  
							
							
							
						 
						
							2019-11-11 14:16:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3db988250b 
								
							 
						 
						
							
							
								
								[ #1335 ] User: refactored :blocks field into :blocked_users relation.  
							
							... 
							
							
							
							Introduced UserBlock. 
							
						 
						
							2019-11-10 16:30:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								62bc0657e7 
								
							 
						 
						
							
							
								
								excluded invisible users from search results  
							
							
							
						 
						
							2019-11-05 08:55:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4e53520917 
								
							 
						 
						
							
							
								
								User Search: Remove superfluous setweight and random test.  
							
							... 
							
							
							
							The test tested for a behavior that isn't actually enforced anymore. 
							
						 
						
							2019-11-04 16:57:41 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4ea1a61b00 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/following-relationships  
							
							
							
						 
						
							2019-10-21 14:19:15 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c6fdfbc4f1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs 
							
						 
						
							2019-10-20 20:43:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e8843974cb 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved remaining fields from User.Info to User.  
							
							... 
							
							
							
							Misc. fixes / improvements. 
							
						 
						
							2019-10-20 13:42:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								835ad52378 
								
							 
						 
						
							
							
								
								remove Salmon module  
							
							
							
						 
						
							2019-10-18 14:50:09 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0a5175ecbb 
								
							 
						 
						
							
							
								
								Order fts results by trigram  
							
							
							
						 
						
							2019-10-16 13:49:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c10ce113d4 
								
							 
						 
						
							
							
								
								User search: Remove trigram and refactor the module  
							
							... 
							
							
							
							- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees 
							
						 
						
							2019-10-16 12:52:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82 
								
							 
						 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship  
							
							
							
						 
						
							2019-10-11 02:35:32 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								8249924485 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity  
							
							
							
						 
						
							2019-10-05 20:12:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e07e9cb75e 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1737  
							
						 
						
							2019-10-05 10:00:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								06d9df79c5 
								
							 
						 
						
							
							
								
								Mastodon API: Add pleroma.unread_conversation_count to the Account entity  
							
							
							
						 
						
							2019-10-04 00:53:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7836adf21 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/moderation-log-filters  
							
							
							
						 
						
							2019-09-26 19:01:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								48a82c4609 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/user' into 'develop'  
							
							... 
							
							
							
							Simplify updating user's `info`
See merge request pleroma/pleroma!1712  
							
						 
						
							2019-09-26 03:00:38 +00:00