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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								505a084058 
								
							 
						 
						
							
							
								
								Still do caching in tests.  
							
							
							
						 
						
							2019-02-03 18:28:14 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								2c59eb3cfc 
								
							 
						 
						
							
							
								
								Add responsive features to layout  
							
							
							
						 
						
							2019-02-02 13:40:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								68d461b3a9 
								
							 
						 
						
							
							
								
								Check if rich media uri is relative  
							
							
							
						 
						
							2019-02-02 12:24:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								833404f0f5 
								
							 
						 
						
							
							
								
								Use with instead of if in the card  
							
							
							
						 
						
							2019-02-02 12:04:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e4d18f328b 
								
							 
						 
						
							
							
								
								merge only if page_url is an absolute path  
							
							
							
						 
						
							2019-02-02 11:53:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cbadf9d333 
								
							 
						 
						
							
							
								
								Fix rich media relative path  
							
							
							
						 
						
							2019-02-02 11:38:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								486749064f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/split-hide-network' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !733  
							
						 
						
							2019-02-01 20:22:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								ffbf306c9a 
								
							 
						 
						
							
							
								
								Merge branch 'streaming-api-url-fix' into 'develop'  
							
							... 
							
							
							
							Fix WebSocket streaming API URL.
See merge request pleroma/pleroma!756  
							
						 
						
							2019-02-01 19:39:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								a184811a60 
								
							 
						 
						
							
							
								
								Use url() instead of static_url in Endpoint.websocket_url()  
							
							
							
						 
						
							2019-02-01 22:35:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								7e384a2425 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'develop'  
							
							... 
							
							
							
							Use nodeinfo 2.1
See merge request pleroma/pleroma!753  
							
						 
						
							2019-02-01 19:18:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luna 
								
							 
						 
						
							
							
							
							
								
							
							
								9cac8729af 
								
							 
						 
						
							
							
								
								update nodeinfo version when requesting 2.1  
							
							
							
						 
						
							2019-02-01 16:03:23 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								d747bd9870 
								
							 
						 
						
							
							
								
								Use String.replace_leading instead of String.replace for getting websocket streaming api url.  
							
							... 
							
							
							
							Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function. 
							
						 
						
							2019-02-01 21:58:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luna 
								
							 
						 
						
							
							
							
							
								
							
							
								1cdcee89da 
								
							 
						 
						
							
							
								
								mix format pass  
							
							
							
						 
						
							2019-02-01 14:40:43 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luna 
								
							 
						 
						
							
							
							
							
								
							
							
								23b1c64a19 
								
							 
						 
						
							
							
								
								downcase software name in nodeinfo  
							
							
							
						 
						
							2019-02-01 14:35:08 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luna 
								
							 
						 
						
							
							
							
							
								
							
							
								b17ce875cf 
								
							 
						 
						
							
							
								
								keep compatibility with nodeinfo 2.0  
							
							... 
							
							
							
							splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler
gives the same result, while the 2.1 handler inserts the
software.repository field. requested by @href 
							
						 
						
							2019-02-01 14:23:40 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74c6119f28 
								
							 
						 
						
							
							
								
								MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list  
							
							
							
						 
						
							2019-02-01 18:21:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0a82a7e6d6 
								
							 
						 
						
							
							
								
								Merge branch 'feature/split-hide-network' into 'develop'  
							
							... 
							
							
							
							Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733  
							
						 
						
							2019-02-01 17:05:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								fc7644798d 
								
							 
						 
						
							
							
								
								Merge branch 'serve-sw-pleroma.js' into 'develop'  
							
							... 
							
							
							
							Serve sw-pleroma.js properly
See merge request pleroma/pleroma!754  
							
						 
						
							2019-02-01 14:24:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fa5ec765d9 
								
							 
						 
						
							
							
								
								Serve sw-pleroma.js properly  
							
							
							
						 
						
							2019-02-01 11:34:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								01d483f9c7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle  
							
							
							
						 
						
							2019-02-01 10:21:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								b3b0855456 
								
							 
						 
						
							
							
								
								Merge branch '534_federation_targets_reachability' into 'develop'  
							
							... 
							
							
							
							[#534 ] Unreachable federation targets retirement
Closes  #534 
See merge request pleroma/pleroma!703  
							
						 
						
							2019-02-01 09:14:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luna 
								
							 
						 
						
							
							
							
							
								
							
							
								b0c4c082c4 
								
							 
						 
						
							
							
								
								mix format pass  
							
							
							
						 
						
							2019-02-01 04:02:40 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luna 
								
							 
						 
						
							
							
							
							
								
							
							
								c05928dbda 
								
							 
						 
						
							
							
								
								use nodeinfo 2.1, add repository field  
							
							... 
							
							
							
							that is the only change from nodeinfo 2.0 to 2.1
also this makes the nodeinfo tests use 2.1.json instead of 2.0.json 
							
						 
						
							2019-02-01 03:55:10 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b19b4f8537 
								
							 
						 
						
							
							
								
								Remove default value for rich media.  
							
							... 
							
							
							
							Setting it to true will actually override a 'false' set before. 
							
						 
						
							2019-01-31 20:02:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								44913c1019 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/rich-media-non-unicode' into 'develop'  
							
							... 
							
							
							
							rich media non-unicode bugfix
See merge request pleroma/pleroma!749  
							
						 
						
							2019-01-31 16:54:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								46dba03098 
								
							 
						 
						
							
							
								
								rich media: parser: only try to validate strings, not numbers (OEmbed)  
							
							
							
						 
						
							2019-01-31 16:19:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								dafb6f0b5e 
								
							 
						 
						
							
							
								
								rich media: parser: reject OGP fields we cannot safely process  
							
							
							
						 
						
							2019-01-31 16:03:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7057891db6 
								
							 
						 
						
							
							
								
								Make rich media support toggleable  
							
							
							
						 
						
							2019-01-31 18:18:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								00d4333373 
								
							 
						 
						
							
							
								
								Merge branch 'features/glitch-soc-frontend' into 'develop'  
							
							... 
							
							
							
							Features/glitch soc frontend
See merge request pleroma/pleroma!192  
							
						 
						
							2019-01-31 10:16:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ea0397e2d 
								
							 
						 
						
							
							
								
								Fix  4aff4efa typos  
							
							
							
						 
						
							2019-01-30 21:08:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4aff4efa8d 
								
							 
						 
						
							
							
								
								Use multiple hackney pools  
							
							... 
							
							
							
							* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections. 
							
						 
						
							2019-01-30 15:06:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								7a2c4f984b 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/fix-rejects' into 'develop'  
							
							... 
							
							
							
							follow request fixups
Closes  #537 
See merge request pleroma/pleroma!734  
							
						 
						
							2019-01-29 14:47:36 +00:00