Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								c8a16f334d 
								
							 
						 
						
							
							
								
								Format  
							
							
							
						 
						
							2018-05-20 21:02:06 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								89c5de9096 
								
							 
						 
						
							
							
								
								Fix unfollows  
							
							
							
						 
						
							2018-05-20 21:01:14 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								1afd6d37bd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow  
							
							... 
							
							
							
							Fixed some conflicts in transmogrifier.ex 
							
						 
						
							2018-05-20 19:17:15 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								434601a5c3 
								
							 
						 
						
							
							
								
								Return private / direct posts on user timelines, too.  
							
							
							
						 
						
							2018-05-20 16:15:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								a9141d88aa 
								
							 
						 
						
							
							
								
								Pass user instead of their ap_id to User.block  
							
							
							
						 
						
							2018-05-19 22:02:13 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								3b706ea493 
								
							 
						 
						
							
							
								
								Remove handler for incoming undos with object references  
							
							
							
						 
						
							2018-05-19 21:34:30 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								1e43de0f86 
								
							 
						 
						
							
							
								
								Formatting and add tests for blocks/unblocks  
							
							
							
						 
						
							2018-05-19 21:23:52 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								da9744eb84 
								
							 
						 
						
							
							
								
								Use correct variable names in unfollow  
							
							
							
						 
						
							2018-05-19 20:57:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thog 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f39ecc41b 
								
							 
						 
						
							
							
								
								Support Undo like activities ( Fix   #139 )  
							
							
							
						 
						
							2018-05-19 22:14:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ad563669c8 
								
							 
						 
						
							
							
								
								Merge branch 'feature/remote-user-deactivation' into 'develop'  
							
							... 
							
							
							
							remote user deactivation
See merge request pleroma/pleroma!154  
							
						 
						
							2018-05-19 09:30:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2051530868 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: handle hubzilla AP actor quirks  
							
							
							
						 
						
							2018-05-19 03:28:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4d2c6707c2 
								
							 
						 
						
							
							
								
								activitypub: normalize the actor to ensure we have its URI  
							
							
							
						 
						
							2018-05-19 03:28:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								13d4b6d2b5 
								
							 
						 
						
							
							
								
								remote user deactivation: fix test failures  
							
							
							
						 
						
							2018-05-19 01:26:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								0ec1abb3b6 
								
							 
						 
						
							
							
								
								Add federated blocks  
							
							
							
						 
						
							2018-05-18 18:09:56 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								8d11bae0d5 
								
							 
						 
						
							
							
								
								Revert "Undo formatting in user.ex"  
							
							... 
							
							
							
							This reverts commit e6dc15b96c 
							
						 
						
							2018-05-17 23:55:00 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								e6dc15b96c 
								
							 
						 
						
							
							
								
								Undo formatting in user.ex  
							
							
							
						 
						
							2018-05-17 23:53:34 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								d8c842a771 
								
							 
						 
						
							
							
								
								Add support for incoming remote unfollows  
							
							
							
						 
						
							2018-05-17 22:15:57 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9390492138 
								
							 
						 
						
							
							
								
								ActivityPub create: discard activities from deactivated users  
							
							
							
						 
						
							2018-05-13 19:05:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c7a85de35c 
								
							 
						 
						
							
							
								
								Revert "Remove 'unlisted' handling for now."  
							
							... 
							
							
							
							This reverts commit 1027d1f696 
							
						 
						
							2018-05-13 12:38:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1027d1f696 
								
							 
						 
						
							
							
								
								Remove 'unlisted' handling for now.  
							
							... 
							
							
							
							It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it. 
							
						 
						
							2018-05-13 12:07:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a5c9dd0a2a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop  
							
							
							
						 
						
							2018-05-13 11:59:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3c3933e40b 
								
							 
						 
						
							
							
								
								Unlisted fetching: Reverse logic  
							
							... 
							
							
							
							Generates a faster query. 
							
						 
						
							2018-05-13 11:58:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								aeff2d6474 
								
							 
						 
						
							
							
								
								Merge branch 'feature/unrepeats' into 'develop'  
							
							... 
							
							
							
							Add unrepeats
Closes  #69 
See merge request pleroma/pleroma!113  
							
						 
						
							2018-05-13 09:32:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ec531ca281 
								
							 
						 
						
							
							
								
								Add test.  
							
							
							
						 
						
							2018-05-13 11:18:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29376fcc13 
								
							 
						 
						
							
							
								
								Format.  
							
							
							
						 
						
							2018-05-13 10:56:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76722ea9c8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses  
							
							
							
						 
						
							2018-05-13 10:56:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								54ccbd8479 
								
							 
						 
						
							
							
								
								Use original status id instead of announce id  
							
							
							
						 
						
							2018-05-13 03:42:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								4d88747561 
								
							 
						 
						
							
							
								
								Revert "Log error when handling unrepeats"  
							
							... 
							
							
							
							This reverts commit c17c55e989 
							
						 
						
							2018-05-11 15:34:46 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								c17c55e989 
								
							 
						 
						
							
							
								
								Log error when handling unrepeats  
							
							
							
						 
						
							2018-05-11 15:29:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c220a6db43 
								
							 
						 
						
							
							
								
								format & made get_policies/1 private  
							
							
							
						 
						
							2018-05-10 18:51:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9e6f37bda 
								
							 
						 
						
							
							
								
								Chain policies  
							
							... 
							
							
							
							- The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies 
							
						 
						
							2018-05-10 18:41:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								900c735467 
								
							 
						 
						
							
							
								
								Match proper number of values from unannounce  
							
							
							
						 
						
							2018-05-09 00:04:14 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								54f6628590 
								
							 
						 
						
							
							
								
								Change argument order and call correct # of args  
							
							
							
						 
						
							2018-05-08 23:59:36 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								e55f69a676 
								
							 
						 
						
							
							
								
								Handle Undo activites containing an Announce  
							
							
							
						 
						
							2018-05-08 23:50:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								4d5ec883b7 
								
							 
						 
						
							
							
								
								Federate correct activity  
							
							
							
						 
						
							2018-05-08 21:52:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ffe028cd73 
								
							 
						 
						
							
							
								
								More warning fixes.  
							
							
							
						 
						
							2018-05-07 18:11:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								6c2903d9a1 
								
							 
						 
						
							
							
								
								Merge branch 'feld-warnings' into 'develop'  
							
							... 
							
							
							
							Clean up warnings
See merge request pleroma/pleroma!144  
							
						 
						
							2018-05-06 18:42:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								bfad57c7c9 
								
							 
						 
						
							
							
								
								Get rid of unsafe variables.  
							
							
							
						 
						
							2018-05-06 09:58:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7a884d70d8 
								
							 
						 
						
							
							
								
								Group def renders here as well  
							
							
							
						 
						
							2018-05-04 22:31:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								14c0c6d16b 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2018-05-04 22:03:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a24eed0f57 
								
							 
						 
						
							
							
								
								That last change was stupid. Multiline comments in Elixir don't really exist.  
							
							... 
							
							
							
							Instead we'll just pad with # intstead of playing stupid games with the compiler. 
							
						 
						
							2018-05-04 21:53:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								79d41aa12e 
								
							 
						 
						
							
							
								
								Dirty hack to remove the warning  
							
							... 
							
							
							
							warning: code block contains unused literal "internal -> Mastodon\n" (remove the literal or assign it to _ to avoid warnings)
  lib/pleroma/web/activity_pub/transmogrifier.ex 
							
						 
						
							2018-05-04 21:48:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								aaacebd906 
								
							 
						 
						
							
							
								
								Fix unused variables, imports, and aliases  
							
							
							
						 
						
							2018-05-04 21:42:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								42f1a098aa 
								
							 
						 
						
							
							
								
								Fix build. Too eager with the fixing of unused variables.  
							
							... 
							
							
							
							== Compilation error in file lib/pleroma/web/activity_pub/views/user_view.ex ==
** (CompileError) lib/pleroma/web/activity_pub/views/user_view.ex:54: undefined function _total/0
    (stdlib) lists.erl:1338: :lists.foreach/2
    (stdlib) erl_eval.erl:670: :erl_eval.do_apply/6 
							
						 
						
							2018-05-04 21:26:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636f0fa402 
								
							 
						 
						
							
							
								
								Clean up unused aliases and imports  
							
							
							
						 
						
							2018-05-04 21:25:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								943820ae29 
								
							 
						 
						
							
							
								
								More unused variables  
							
							
							
						 
						
							2018-05-04 21:16:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4aa5720a 
								
							 
						 
						
							
							
								
								Fix a bunch of unused variable warnings  
							
							
							
						 
						
							2018-05-04 20:59:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a3d1d4894f 
								
							 
						 
						
							
							
								
								ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks  
							
							
							
						 
						
							2018-04-28 22:32:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4d55d7c95e 
								
							 
						 
						
							
							
								
								Insert object after being rewritten.  
							
							
							
						 
						
							2018-04-28 16:10:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								a7a40bb8f1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/blocked-user-boosts' into 'develop'  
							
							... 
							
							
							
							ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111  
							
						 
						
							2018-04-28 13:49:12 +00:00