William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								045803346d 
								
							 
						 
						
							
							
								
								move key generation functions into Pleroma.Keys module  
							
							
							
						 
						
							2019-05-22 03:58:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								eb02edcad9 
								
							 
						 
						
							
							
								
								Add virtual :thread_muted? field  
							
							... 
							
							
							
							that may be set when fetching activities 
							
						 
						
							2019-05-21 00:35:46 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								2375e9a95b 
								
							 
						 
						
							
							
								
								Add report filtering to MRF.SimplePolicy  
							
							
							
						 
						
							2019-05-20 06:02:50 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								78588dbd80 
								
							 
						 
						
							
							
								
								mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw  
							
							
							
						 
						
							2019-05-17 18:49:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								7ed682213f 
								
							 
						 
						
							
							
								
								Fix/902 random compile failing  
							
							
							
						 
						
							2019-05-17 07:25:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								70235ce840 
								
							 
						 
						
							
							
								
								Fix typo: s/"tags"/"tag"/g  
							
							
							
						 
						
							2019-05-17 09:02:34 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e2b3a27204 
								
							 
						 
						
							
							
								
								Add Reports to Admin API  
							
							
							
						 
						
							2019-05-16 19:09:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								e190b3022b 
								
							 
						 
						
							
							
								
								Merge branch 'fix/domain-unblocked-reblogs' into 'develop'  
							
							... 
							
							
							
							Fix domain-unblocked reblogs
Closes  #892 
See merge request pleroma/pleroma!1157  
							
						 
						
							2019-05-16 18:57:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ebb0482116 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into conversations-import  
							
							
							
						 
						
							2019-05-16 13:11:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								793f1834d2 
								
							 
						 
						
							
							
								
								Use named binding to conditionally join object  
							
							
							
						 
						
							2019-05-16 06:25:14 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								2b6119dfbf 
								
							 
						 
						
							
							
								
								Restrict reblogs of activities from blocked domains  
							
							
							
						 
						
							2019-05-16 05:53:51 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a591ab6112 
								
							 
						 
						
							
							
								
								activity pub: remove Ecto SQL query dumps  
							
							
							
						 
						
							2019-05-15 16:56:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								31db31c587 
								
							 
						 
						
							
							
								
								activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread  
							
							
							
						 
						
							2019-05-15 15:54:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								de114ffbb0 
								
							 
						 
						
							
							
								
								activitypub: remove contain_timeline()  
							
							
							
						 
						
							2019-05-15 15:53:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0387f52138 
								
							 
						 
						
							
							
								
								activitypub: add restrict_thread_visibility()  
							
							
							
						 
						
							2019-05-15 15:53:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f168a1cbdc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into conversations-import  
							
							
							
						 
						
							2019-05-15 17:47:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								4440e23547 
								
							 
						 
						
							
							
								
								Merge branch 'chore/extricate-http-signatures' into 'develop'  
							
							... 
							
							
							
							switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155  
							
						 
						
							2019-05-15 15:37:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb3451023 
								
							 
						 
						
							
							
								
								CommonAPI: Refactor visibility, forbid public to private replies.  
							
							
							
						 
						
							2019-05-15 16:30:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								071f78733a 
								
							 
						 
						
							
							
								
								switch to pleroma/http_signatures library  
							
							
							
						 
						
							2019-05-14 20:03:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								692919c7d2 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/use-job-queue-everywhere' into 'develop'  
							
							... 
							
							
							
							use job queue everywhere
Closes  #862 
See merge request pleroma/pleroma!1142  
							
						 
						
							2019-05-14 15:27:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5e2b491276 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-14 18:15:56 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								498bfdf403 
								
							 
						 
						
							
							
								
								Switch to Jason over Poison  
							
							
							
						 
						
							2019-05-13 15:37:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								57d11ac9db 
								
							 
						 
						
							
							
								
								activitypub: move post rich media fetching to job queue  
							
							
							
						 
						
							2019-05-13 19:36:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								44b182732e 
								
							 
						 
						
							
							
								
								nodeinfo: gather supported protocol names from federation modules  
							
							
							
						 
						
							2019-05-12 19:15:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								28f7f4c6de 
								
							 
						 
						
							
							
								
								webfinger: build the response based on enabled federation modules  
							
							
							
						 
						
							2019-05-12 19:05:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c23276a59a 
								
							 
						 
						
							
							
								
								activitypub: publisher: fixups  
							
							
							
						 
						
							2019-05-12 05:04:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								85377c0b67 
								
							 
						 
						
							
							
								
								federator: move activitypub relaying to the AP publisher module  
							
							
							
						 
						
							2019-05-12 05:04:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ef1f9e8d4e 
								
							 
						 
						
							
							
								
								activitypub: split out outgoing federation into a federation module  
							
							
							
						 
						
							2019-05-12 05:04:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a33bec7d58 
								
							 
						 
						
							
							
								
								Conversations: Import order, import as read.  
							
							
							
						 
						
							2019-05-09 16:39:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e6d7f8d223 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							
							
						 
						
							2019-05-08 18:19:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a4598b5e8b 
								
							 
						 
						
							
							
								
								Visibility: Make it more resilient.  
							
							
							
						 
						
							2019-05-08 18:08:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								920bd47055 
								
							 
						 
						
							
							
								
								ActivityPub: Remove leftover printf debugging.  
							
							
							
						 
						
							2019-05-08 17:40:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fcf2f38d20 
								
							 
						 
						
							
							
								
								Conversations: Add a function to 'import' old DMs.  
							
							
							
						 
						
							2019-05-08 17:37:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								14deed7f7d 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'  
							
							... 
							
							
							
							Optimize bookmarks by preloading them with activities
Closes  #861 
See merge request pleroma/pleroma!1121  
							
						 
						
							2019-05-07 19:37:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6020ff3fb6 
								
							 
						 
						
							
							
								
								activitypub: add optional order constraint to timeline query builder  
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5125dedc 
								
							 
						 
						
							
							
								
								Remove bookmarks assoc and add a fake bookmark assoc instead  
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f841eb7cdb 
								
							 
						 
						
							
							
								
								Preload bookmarks wherever the object is preloaded  
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a1a0df19c4 
								
							 
						 
						
							
							
								
								Merge branch 'docs/MRF-modules' into 'develop'  
							
							... 
							
							
							
							Documentation: MRF Modules
See merge request pleroma/pleroma!1122  
							
						 
						
							2019-05-07 16:15:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								238dd72fad 
								
							 
						 
						
							
							
								
								Merge branch 'conversations_three' into 'develop'  
							
							... 
							
							
							
							Conversations once more.
See merge request pleroma/pleroma!1119  
							
						 
						
							2019-05-07 14:43:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1557b99beb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-05-07 16:51:11 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e41a2f98d5 
								
							 
						 
						
							
							
								
								mrf/tag_policy.ex: Add some documentation  
							
							... 
							
							
							
							mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one? 
							
						 
						
							2019-05-06 04:53:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af62ace954 
								
							 
						 
						
							
							
								
								Add short documentation on every MRF Policy  
							
							
							
						 
						
							2019-05-06 04:49:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02 
								
							 
						 
						
							
							
								
								formatter.ex: Add get_emoji_map/1  
							
							
							
						 
						
							2019-05-03 16:27:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								81d1aa424d 
								
							 
						 
						
							
							
								
								Streamer: Stream out Conversations/Participations.  
							
							
							
						 
						
							2019-05-03 13:39:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								45f790becc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into conversations_three  
							
							
							
						 
						
							2019-05-01 18:40:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f11e7037c2 
								
							 
						 
						
							
							
								
								test fixes  
							
							
							
						 
						
							2019-05-01 16:09:53 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								bdfa3a6fa8 
								
							 
						 
						
							
							
								
								Merging with develop  
							
							... 
							
							
							
							Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex 
							
						 
						
							2019-05-01 12:29:33 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ce4825c1dc 
								
							 
						 
						
							
							
								
								Do not normalize objects in stream_out unless the activity type is  
							
							... 
							
							
							
							Create
Saves quite a bit of time with delete activities because they would
always query the db 
							
						 
						
							2019-04-30 20:21:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c157e27a00 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/disable-account  
							
							
							
						 
						
							2019-04-25 13:41:10 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0fd0ffcd76 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: send reject follow if following does not succeed  
							
							
							
						 
						
							2019-04-25 00:48:45 +00:00