kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								d120aa63f0 
								
							 
						 
						
							
							
								
								Merge branch 'fix-dm-index' into 'develop'  
							
							... 
							
							
							
							Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772  
							
						 
						
							2019-02-05 20:27:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								681ba1e52f 
								
							 
						 
						
							
							
								
								Merge branch 'feature/ap-c2s-whoami' into 'develop'  
							
							... 
							
							
							
							activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773  
							
						 
						
							2019-02-05 20:26:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								00d572fd58 
								
							 
						 
						
							
							
								
								Merge branch 'testfix/twitter-api' into 'develop'  
							
							... 
							
							
							
							test: twitterapi: fix another possible test failure case
See merge request pleroma/pleroma!778  
							
						 
						
							2019-02-05 20:13:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								73e6a1f1dd 
								
							 
						 
						
							
							
								
								test: twitterapi: fix another possible test failure case  
							
							
							
						 
						
							2019-02-05 20:08:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								eb2b1960e0 
								
							 
						 
						
							
							
								
								Merge branch 'feature/split-hide-network-v2' into 'develop'  
							
							... 
							
							
							
							Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765  
							
						 
						
							2019-02-05 18:56:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ecdb0b7f57 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/rich-media-image-nil' into 'develop'  
							
							... 
							
							
							
							mastodon api: fix rendering of cards without image URLs (closes  #597 )
Closes  #597 
See merge request pleroma/pleroma!777  
							
						 
						
							2019-02-05 18:53:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c4d317ccb6 
								
							 
						 
						
							
							
								
								test: twitterapi: fix the test breakage for real  
							
							
							
						 
						
							2019-02-05 18:49:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1d94b67e40 
								
							 
						 
						
							
							
								
								mastodon api: fix rendering of cards without image URLs ( closes   #597 )  
							
							
							
						 
						
							2019-02-05 18:30:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								f8b831ecfd 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'  
							
							... 
							
							
							
							activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774  
							
						 
						
							2019-02-05 11:30:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								040ab352a5 
								
							 
						 
						
							
							
								
								Merge branch 'patch-2' into 'develop'  
							
							... 
							
							
							
							ARGLE GARBLE
See merge request pleroma/pleroma!776  
							
						 
						
							2019-02-05 11:29:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								8892f4468c 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/rich-media-nil' into 'develop'  
							
							... 
							
							
							
							html: don't attempt to parse nil content
See merge request pleroma/pleroma!775  
							
						 
						
							2019-02-05 11:28:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								c48aba3c2a 
								
							 
						 
						
							
							
								
								Fix SQL  
							
							
							
						 
						
							2019-02-05 10:22:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									witches.live 
								
							 
						 
						
							
							
							
							
								
							
							
								47eb557617 
								
							 
						 
						
							
							
								
								ARGLE GARBLE  
							
							... 
							
							
							
							Update .gitignore 
							
						 
						
							2019-02-05 07:03:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a2bb5d890d 
								
							 
						 
						
							
							
								
								html: don't attempt to parse nil content  
							
							
							
						 
						
							2019-02-05 05:06:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e71ab5a10f 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: fix bare tags  
							
							
							
						 
						
							2019-02-05 00:43:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								db1165f70f 
								
							 
						 
						
							
							
								
								activitypub: c2s: add /api/ap/whoami endpoint for andstatus  
							
							
							
						 
						
							2019-02-04 22:58:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3c8b02d65 
								
							 
						 
						
							
							
								
								Massage index until it actually does the stuff we want.  
							
							... 
							
							
							
							Also makes the index a lot smoler. 
							
						 
						
							2019-02-04 23:47:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								cd6606b7f6 
								
							 
						 
						
							
							
								
								Initialize hide_network with false  
							
							
							
						 
						
							2019-02-04 22:23:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								03991e7bc5 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mrf-tag' into 'develop'  
							
							... 
							
							
							
							MRF TagPolicy engine
See merge request pleroma/pleroma!768  
							
						 
						
							2019-02-04 19:20:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7d110be119 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: fix force-unlisted and sandbox actions  
							
							
							
						 
						
							2019-02-04 19:03:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								64a3993425 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: add support for subscription control  
							
							
							
						 
						
							2019-02-04 17:48:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3ae11835a9 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'  
							
							... 
							
							
							
							fix hellthread threshold deprecation warning
See merge request pleroma/pleroma!770  
							
						 
						
							2019-02-04 17:32:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								4031c94a59 
								
							 
						 
						
							
							
								
								fix hellthread threshold deprecation warning  
							
							
							
						 
						
							2019-02-04 18:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ff2c28fd6d 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: refactor the filtering hook a bit  
							
							
							
						 
						
							2019-02-04 17:06:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9a69f08e86 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: add support for processing follow requests  
							
							
							
						 
						
							2019-02-04 17:04:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								084bb8ccd5 
								
							 
						 
						
							
							
								
								activitypub: mrf: tag policy: implement force-unlisted and sandbox  
							
							
							
						 
						
							2019-02-04 17:04:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								88e32a32ce 
								
							 
						 
						
							
							
								
								mrf: add initial MRF.TagPolicy engine  
							
							
							
						 
						
							2019-02-04 17:04:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								93e136d70b 
								
							 
						 
						
							
							
								
								mix: add user tag/untag task  
							
							
							
						 
						
							2019-02-04 17:04:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								25a659d2dc 
								
							 
						 
						
							
							
								
								Merge branch 'mime-riff' into 'develop'  
							
							... 
							
							
							
							Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769  
							
						 
						
							2019-02-04 16:52:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								127f99ae18 
								
							 
						 
						
							
							
								
								Mime: detect RIFF formats (wave, webp, avi)  
							
							
							
						 
						
							2019-02-04 17:44:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								00835bf678 
								
							 
						 
						
							
							
								
								Merge branch 'fix/rich-media-relative-path' into 'develop'  
							
							... 
							
							
							
							Fix rich media relative path
Closes  #588 
See merge request pleroma/pleroma!759  
							
						 
						
							2019-02-04 16:01:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								89762ad230 
								
							 
						 
						
							
							
								
								Merge branch 'feature/hellthread-filter-improvements' into 'develop'  
							
							... 
							
							
							
							Improve hellthread filter
Closes  #584 
See merge request pleroma/pleroma!766  
							
						 
						
							2019-02-04 12:36:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								58262a8b8a 
								
							 
						 
						
							
							
								
								removed a debug thingy  
							
							
							
						 
						
							2019-02-04 11:22:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								4430641349 
								
							 
						 
						
							
							
								
								squished a bug  
							
							
							
						 
						
							2019-02-04 12:09:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								3cf046babb 
								
							 
						 
						
							
							
								
								actually commited the changes  
							
							
							
						 
						
							2019-02-04 10:23:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								63a4f4b7be 
								
							 
						 
						
							
							
								
								fixed Map,put arguments, updated nomenclature  
							
							
							
						 
						
							2019-02-04 10:23:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								583c4e0f17 
								
							 
						 
						
							
							
								
								more tweaks, fixed silly mistakes...  
							
							
							
						 
						
							2019-02-03 23:56:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								e10cda7541 
								
							 
						 
						
							
							
								
								implemented tweaks  
							
							
							
						 
						
							2019-02-03 22:46:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c57f37bd36 
								
							 
						 
						
							
							
								
								Merge branch 'mogrify-orient' into 'develop'  
							
							... 
							
							
							
							Update Mogrify docs and warning for deprecated syntax
See merge request pleroma/pleroma!763  
							
						 
						
							2019-02-03 21:06:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								531507a635 
								
							 
						 
						
							
							
								
								fixed things  
							
							
							
						 
						
							2019-02-03 20:45:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								10130fa7d6 
								
							 
						 
						
							
							
								
								made toggleable, added docs  
							
							
							
						 
						
							2019-02-03 20:27:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								0ef0ae35ab 
								
							 
						 
						
							
							
								
								added optional delist feature  
							
							
							
						 
						
							2019-02-03 20:12:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								16ce129e38 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings (fixed)  
							
							
							
						 
						
							2019-02-03 21:55:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								69a38644bc 
								
							 
						 
						
							
							
								
								Merge branch '589-fix-cache' into 'develop'  
							
							... 
							
							
							
							Resolve "Update object cache on favs/boosts"
Closes  #589 
See merge request pleroma/pleroma!764  
							
						 
						
							2019-02-03 18:19:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e61f0be951 
								
							 
						 
						
							
							
								
								Unbreak all the tests.  
							
							
							
						 
						
							2019-02-03 18:54:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								505a084058 
								
							 
						 
						
							
							
								
								Still do caching in tests.  
							
							
							
						 
						
							2019-02-03 18:28:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0c08bd4181 
								
							 
						 
						
							
							
								
								Update Mogrify docs and warning for deprecated syntax to encourage  
							
							... 
							
							
							
							users to enable both strip and auto-orient 
							
						 
						
							2019-02-03 16:39:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								8180de951e 
								
							 
						 
						
							
							
								
								Merge branch '582_federation_retirement_optimization' into 'develop'  
							
							... 
							
							
							
							[#582 ] Optimized federation retirement by reducing the number of SQL calls
Closes  #582 
See merge request pleroma/pleroma!762  
							
						 
						
							2019-02-03 15:47:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3913b0196e 
								
							 
						 
						
							
							
								
								[ #582 ] Made single-pub task call Instance.set_reachable/1 if set_reachable is not specified.  
							
							... 
							
							
							
							Added tests. 
							
						 
						
							2019-02-03 13:28:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b40b4bc4e5 
								
							 
						 
						
							
							
								
								[ #582 ] Optimized federation retirement by reducing the number of SQL calls  
							
							... 
							
							
							
							(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`). 
							
						 
						
							2019-02-03 12:41:27 +03:00