rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								83a3de8cc4 
								
							 
						 
						
							
							
								
								Merge branch 'length-limit-bio' into 'develop'  
							
							 
							
							... 
							
							
							
							Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515  
							
						 
						
							2019-08-13 22:40:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4f34fbcb 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-08-02 18:16:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5ff8f07ca9 
								
							 
						 
						
							
							
								
								Merge branch 'feature/hide-follows-remote' into 'develop'  
							
							 
							
							... 
							
							
							
							Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411  
							
						 
						
							2019-08-02 11:23:07 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9ca4506355 
								
							 
						 
						
							
							
								
								Add configurable length limits for User.bio and User.name  
							
							 
							
							
							
						 
						
							2019-08-01 15:53:37 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								301ea0dc04 
								
							 
						 
						
							
							
								
								Add tests for counters being updated on follow  
							
							 
							
							
							
						 
						
							2019-07-31 21:09:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								58443d0cd6 
								
							 
						 
						
							
							
								
								tests for TwitterApi/UtilController  
							
							 
							
							
							
						 
						
							2019-07-31 15:14:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f42719506c 
								
							 
						 
						
							
							
								
								Fix credo issues  
							
							 
							
							
							
						 
						
							2019-07-31 14:20:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c88a5d3251 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/hide-follows-remote  
							
							 
							
							
							
						 
						
							2019-07-31 14:12:29 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								6a4b8b2681 
								
							 
						 
						
							
							
								
								fixed User.update_and_set_cache for stale user  
							
							 
							
							
							
						 
						
							2019-07-28 20:29:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								41e0304757 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/hide-follows-remote  
							
							 
							
							
							
						 
						
							2019-07-25 18:43:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4504135894 
								
							 
						 
						
							
							
								
								Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)  
							
							 
							
							
							
						 
						
							2019-07-24 15:12:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d2da3d30f3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-07-24 16:37:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c49a09ed88 
								
							 
						 
						
							
							
								
								tests for Pleroma.Web.ActivityPub.Publisher  
							
							 
							
							
							
						 
						
							2019-07-23 19:15:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								54a161cb7a 
								
							 
						 
						
							
							
								
								move unauth'd user blocks?/2 check  
							
							 
							
							
							
						 
						
							2019-07-23 19:44:47 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								b70e659304 
								
							 
						 
						
							
							
								
								Feature/1087 wildcard option for blocks  
							
							 
							
							
							
						 
						
							2019-07-22 14:33:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								196cad46f3 
								
							 
						 
						
							
							
								
								Resolve merge conflicts  
							
							 
							
							
							
						 
						
							2019-07-20 22:04:47 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d4ee76ab63 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/user.ex  
							
							 
							
							
							
						 
						
							2019-07-20 18:52:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8292331b35 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-07-20 16:41:58 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d0198fe215 
								
							 
						 
						
							
							
								
								[ #1112 ] Preserving id on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.  
							
							 
							
							
							
						 
						
							2019-07-20 13:03:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								36049f08ef 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-07-20 01:03:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								62e5ff624e 
								
							 
						 
						
							
							
								
								user: add is_internal_user? helper function  
							
							 
							
							
							
						 
						
							2019-07-17 17:12:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								4885473be2 
								
							 
						 
						
							
							
								
								user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()  
							
							 
							
							
							
						 
						
							2019-07-17 16:03:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9bca70b10a 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-07-16 16:19:19 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								c32384c1ea 
								
							 
						 
						
							
							
								
								tests for Pleroma.Signature  
							
							 
							
							
							
						 
						
							2019-07-15 13:01:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c729883936 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-07-14 21:43:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c39b7ac8 
								
							 
						 
						
							
							
								
								Feature/1072 muting notifications  
							
							 
							
							
							
						 
						
							2019-07-14 13:29:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2dcb4c69 
								
							 
						 
						
							
							
								
								Add follow information refetching after following/unfollowing  
							
							 
							
							
							
						 
						
							2019-07-14 01:58:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e8fa477793 
								
							 
						 
						
							
							
								
								Refactor Follows/Followers counter syncronization  
							
							 
							
							... 
							
							
							
							- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page 
							
						 
						
							2019-07-13 19:27:49 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eae991b06a 
								
							 
						 
						
							
							
								
								merge develop  
							
							 
							
							
							
						 
						
							2019-07-12 18:08:27 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								beba7bbc85 
								
							 
						 
						
							
							
								
								removing synchronization worker  
							
							 
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f8786fa6f2 
								
							 
						 
						
							
							
								
								adding following_address field to user  
							
							 
							
							
							
						 
						
							2019-07-10 17:42:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								2d2b50ccca 
								
							 
						 
						
							
							
								
								Send and handle "Delete" activity for deleted users  
							
							 
							
							
							
						 
						
							2019-07-10 05:16:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								371d39e160 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							
							
						 
						
							2019-07-09 21:21:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								d6b0fce6e9 
								
							 
						 
						
							
							
								
								Fix/1019 correct count remote users  
							
							 
							
							
							
						 
						
							2019-07-09 17:36:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								6dadf5d6f4 
								
							 
						 
						
							
							
								
								[ #1043 ] fix search accounts.  
							
							 
							
							
							
						 
						
							2019-07-05 04:22:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								657277ffc0 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							 
							
							
							
						 
						
							2019-06-29 00:52:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								a0c4ebb4d7 
								
							 
						 
						
							
							
								
								[ #184 ] small refactoring  reset password  
							
							 
							
							
							
						 
						
							2019-06-24 19:01:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								2c63c67512 
								
							 
						 
						
							
							
								
								Rework user deletion  
							
							 
							
							
							
						 
						
							2019-06-24 18:59:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								c2ca1f22a2 
								
							 
						 
						
							
							
								
								it is changed in compile time  
							
							 
							
							... 
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 
						
							2019-06-14 15:45:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								01fe5abad1 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							 
							
							
							
						 
						
							2019-06-07 01:20:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								3f6da9c45a 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/377-stuck-follow-request' into 'develop'  
							
							 
							
							... 
							
							
							
							Bugfix/377 stuck follow request
Closes  #377 
See merge request pleroma/pleroma!1250  
							
						 
						
							2019-06-05 15:52:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a511d2f900 
								
							 
						 
						
							
							
								
								Merge branch 'improve-search' into 'develop'  
							
							 
							
							... 
							
							
							
							[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220  
							
						 
						
							2019-06-05 15:51:32 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								076c9ae40e 
								
							 
						 
						
							
							
								
								User: Remove superfluous maybe_follow.  
							
							 
							
							
							
						 
						
							2019-06-05 14:24:31 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								024dfdc39c 
								
							 
						 
						
							
							
								
								Typo + Linting.  
							
							 
							
							
							
						 
						
							2019-06-05 12:45:28 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8b9a0dd4a7 
								
							 
						 
						
							
							
								
								User: Don't error out when following a user that's already followed.  
							
							 
							
							... 
							
							
							
							This leads to a few situations where it is impossible to follow a user. 
							
						 
						
							2019-06-05 12:06:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1cb245c982 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							 
							
							
							
						 
						
							2019-06-05 16:55:17 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5b04f07a1e 
								
							 
						 
						
							
							
								
								Limit search for unauthenticated users to local users only  
							
							 
							
							
							
						 
						
							2019-06-05 16:51:04 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6ef145b4fc 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/digest-email  
							
							 
							
							
							
						 
						
							2019-06-03 15:29:53 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2b664b048e 
								
							 
						 
						
							
							
								
								User: Add function to get AP ids from nicknames.  
							
							 
							
							
							
						 
						
							2019-06-03 18:16:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6872c5f88f 
								
							 
						 
						
							
							
								
								Mastodon API search default value for "resolve" is false  
							
							 
							
							... 
							
							
							
							https://docs.joinmastodon.org/api/rest/accounts/ 
https://docs.joinmastodon.org/api/rest/search/  
							
						 
						
							2019-05-31 18:46:57 +00:00