William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								735cdfb848 
								
							 
						 
						
							
							
								
								user: add User.html_filter_policy()  
							
							 
							
							
							
						 
						
							2018-09-22 02:53:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c9f6eb9a41 
								
							 
						 
						
							
							
								
								user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)  
							
							 
							
							
							
						 
						
							2018-09-20 23:50:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b61430163b 
								
							 
						 
						
							
							
								
								user: add moderator_user_query()  
							
							 
							
							
							
						 
						
							2018-09-03 12:03:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Will Pearson 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2a0e3551 
								
							 
						 
						
							
							
								
								Specify default scope in verify_credentials  
							
							 
							
							... 
							
							
							
							Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value. 
							
						 
						
							2018-08-31 21:04:46 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5dd6542db5 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2018-08-27 10:46:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1089d3658e 
								
							 
						 
						
							
							
								
								user: fix up notification last calculation [NOT related to upstream]  
							
							 
							
							
							
						 
						
							2018-08-27 10:46:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								46c7c2380c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/relay' into 'develop'  
							
							 
							
							... 
							
							
							
							message relay
Closes  #144 
See merge request pleroma/pleroma!264  
							
						 
						
							2018-08-27 08:29:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								440b459cd1 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/announce-timeline-flooding' into 'develop'  
							
							 
							
							... 
							
							
							
							activitypub: filter destination list for announce activities differently than normal (closes  #164 )
Closes  #164 
See merge request pleroma/pleroma!227  
							
						 
						
							2018-08-27 08:25:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0f5bff8c66 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/relay'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex 
							
						 
						
							2018-08-26 21:06:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d91fd48edf 
								
							 
						 
						
							
							
								
								user: do not leak virtuals in account search  
							
							 
							
							
							
						 
						
							2018-08-06 11:29:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ecfd4b2106 
								
							 
						 
						
							
							
								
								user: hide virtual actors from statistics queries  
							
							 
							
							
							
						 
						
							2018-08-06 11:29:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e49131bb72 
								
							 
						 
						
							
							
								
								relay: move to /relay endpoint from / due to webapp issues  
							
							 
							
							
							
						 
						
							2018-08-06 08:22:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ae3cb652b6 
								
							 
						 
						
							
							
								
								user: set up a valid followers address to use  
							
							 
							
							
							
						 
						
							2018-08-06 08:22:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1c90f88393 
								
							 
						 
						
							
							
								
								user: remote actors can have no nickname if they are virtual services  
							
							 
							
							
							
						 
						
							2018-08-06 08:22:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4807a52284 
								
							 
						 
						
							
							
								
								user: support creating an actor which represents the instance itself  
							
							 
							
							
							
						 
						
							2018-08-06 08:22:07 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								275c42e438 
								
							 
						 
						
							
							
								
								user: filter out duplicate follow requests  
							
							 
							
							
							
						 
						
							2018-08-05 01:11:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								47189531c5 
								
							 
						 
						
							
							
								
								user: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							 
							
							
							
						 
						
							2018-06-27 13:07:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc96f222c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/configurable-blocks' into 'develop'  
							
							 
							
							... 
							
							
							
							Add more configurability to how blocks work
See merge request pleroma/pleroma!203  
							
						 
						
							2018-06-25 06:12:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4038ede07 
								
							 
						 
						
							
							
								
								fix mind-crushingly dumb syntax error  
							
							 
							
							
							
						 
						
							2018-06-23 14:32:00 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4990283de 
								
							 
						 
						
							
							
								
								change moved attributes into normal variables  
							
							 
							
							
							
						 
						
							2018-06-23 14:27:07 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e099fcfa9 
								
							 
						 
						
							
							
								
								move configurable module attributes into relevant functions  
							
							 
							
							
							
						 
						
							2018-06-23 14:16:08 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								056305dfa7 
								
							 
						 
						
							
							
								
								user: add helper function to fetch a user given only an ap_id (fix tests)  
							
							 
							
							
							
						 
						
							2018-06-19 08:31:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								320ca7b11e 
								
							 
						 
						
							
							
								
								user: when processing a block in User.block(), ensure all follow relationships are broken  
							
							 
							
							... 
							
							
							
							this is needed for activitypub conformance
ref #213  
							
						 
						
							2018-06-19 00:59:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7e0f62acee 
								
							 
						 
						
							
							
								
								object: add helper functions to handle various forms of a given object and return a normalized one  
							
							 
							
							
							
						 
						
							2018-06-18 05:27:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								591c82620e 
								
							 
						 
						
							
							
								
								activitypub: filter destination list for announce activities differently than normal ( closes   #164 )  
							
							 
							
							
							
						 
						
							2018-06-18 04:36:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
							
							
								
							
							
								2e294ee44a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/configurable-blocks  
							
							 
							
							
							
						 
						
							2018-06-16 15:37:16 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5eed1ea181 
								
							 
						 
						
							
							
								
								run mix format  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1452b2823f 
								
							 
						 
						
							
							
								
								user: add a workaround for situations where Pleroma may believe a followee is followed  
							
							 
							
							... 
							
							
							
							this was caused by lack of Undo follows in the early days, and can likely be eventually removed 
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ad7188fe92 
								
							 
						 
						
							
							
								
								user: use Enum.uniq on the follow request query  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9c88933422 
								
							 
						 
						
							
							
								
								implement tracking of follow requests  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e5206752e1 
								
							 
						 
						
							
							
								
								activitypub: only send accept back automatically if the account is not locked  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								7f79b467b1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/domain-blocks' into 'develop'  
							
							 
							
							... 
							
							
							
							Domain blocks
See merge request pleroma/pleroma!190  
							
						 
						
							2018-06-11 11:19:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
							
							
								
							
							
								4f9ecfc77a 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2018-06-09 04:28:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
							
							
								
							
							
								16d896f526 
								
							 
						 
						
							
							
								
								fixes  
							
							 
							
							
							
						 
						
							2018-06-08 19:01:14 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
							
							
								
							
							
								b3580b6971 
								
							 
						 
						
							
							
								
								add option to not deny follow if blocked (fixed)  
							
							 
							
							
							
						 
						
							2018-06-08 18:29:41 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1e9dd6fbc2 
								
							 
						 
						
							
							
								
								user: fix maybe_direct_follow() after user_info() refactoring broke it slightly  
							
							 
							
							
							
						 
						
							2018-06-08 02:52:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								4856962434 
								
							 
						 
						
							
							
								
								MastoAPI: add domain blocking.  
							
							 
							
							
							
						 
						
							2018-06-03 22:21:23 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								87566b6e2f 
								
							 
						 
						
							
							
								
								user.ex: add domain blocks.  
							
							 
							
							
							
						 
						
							2018-06-03 22:01:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6138b29783 
								
							 
						 
						
							
							
								
								There are no symbols in JSON.  
							
							 
							
							
							
						 
						
							2018-05-26 15:20:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								745072b2cc 
								
							 
						 
						
							
							
								
								Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop  
							
							 
							
							
							
						 
						
							2018-05-26 15:15:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e80d91c64a 
								
							 
						 
						
							
							
								
								introduce User.maybe_direct_follow() and use it where we used to call User.follow()  
							
							 
							
							
							
						 
						
							2018-05-25 09:40:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c0ca9f82b9 
								
							 
						 
						
							
							
								
								mastodon api: properly track if an account is locked or not  
							
							 
							
							
							
						 
						
							2018-05-25 06:14:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1d88abf2d4 
								
							 
						 
						
							
							
								
								user: do not allow refollowing somebody who has blocked a user  
							
							 
							
							
							
						 
						
							2018-05-25 03:18:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thog 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e55c6f311b 
								
							 
						 
						
							
							
								
								Migrate to comeonin 4 and Cachex 3  
							
							 
							
							... 
							
							
							
							Also fix some warning in the code and add a missing alias 
							
						 
						
							2018-05-20 20:08:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6e8de2faae 
								
							 
						 
						
							
							
								
								run mix format  
							
							 
							
							
							
						 
						
							2018-05-19 08:37:04 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d4bbec6b3 
								
							 
						 
						
							
							
								
								Fix User search.  
							
							 
							
							... 
							
							
							
							Now uses a trigram based search. This is a lot faster and gives better
results. Closes  #185 . 
							
						 
						
							2018-05-16 17:55:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								279b1d19f0 
								
							 
						 
						
							
							
								
								Align local bio limits to remote limit.  
							
							 
							
							
							
						 
						
							2018-04-25 15:41:59 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								afe892ddac 
								
							 
						 
						
							
							
								
								Correct syntax with mix format  
							
							 
							
							
							
						 
						
							2018-04-24 14:12:23 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Dashie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9972678a68 
								
							 
						 
						
							
							
								
								Add User.decrease_note_count and call it from ActivityPub.delete  
							
							 
							
							
							
						 
						
							2018-04-24 11:34:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								947431e9aa 
								
							 
						 
						
							
							
								
								MastoAPI and OAuth: allow login with either email or username.  
							
							 
							
							
							
						 
						
							2018-04-18 13:13:57 +03:00