kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								bd5086731e 
								
							 
						 
						
							
							
								
								Merge branch 'multiple-hackney-pools' into 'develop'  
							
							 
							
							... 
							
							
							
							Use multiple hackney pools
See merge request pleroma/pleroma!739  
							
						 
						
							2019-01-30 19:01:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								47ec690c54 
								
							 
						 
						
							
							
								
								Use race-condition free mass follow.  
							
							 
							
							
							
						 
						
							2019-01-30 19:33:25 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								935e65e261 
								
							 
						 
						
							
							
								
								Use race-condition free following method.  
							
							 
							
							
							
						 
						
							2019-01-30 19:21:04 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								d03a116654 
								
							 
						 
						
							
							
								
								Merge branch 'hj-happiness-improvement' into 'develop'  
							
							 
							
							... 
							
							
							
							New frontend configuration mechanism.
Closes  #445 
See merge request pleroma/pleroma!700  
							
						 
						
							2019-01-29 13:54:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								57549f6043 
								
							 
						 
						
							
							
								
								activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target  
							
							 
							
							
							
						 
						
							2019-01-29 12:21:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb2b709de 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: fix follow request rejections  
							
							 
							
							
							
						 
						
							2019-01-29 11:57:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								ebb3496386 
								
							 
						 
						
							
							
								
								Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'  
							
							 
							
							... 
							
							
							
							Rich Media support, part 2.
See merge request pleroma/pleroma!719  
							
						 
						
							2019-01-29 05:11:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								61d6715714 
								
							 
						 
						
							
							
								
								rich media: oembed: return data in the same format as the other parsers  
							
							 
							
							
							
						 
						
							2019-01-28 21:13:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ddb5545202 
								
							 
						 
						
							
							
								
								rich media: kill some testsuite noise  
							
							 
							
							
							
						 
						
							2019-01-28 20:55:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0f11254a06 
								
							 
						 
						
							
							
								
								rich media: parser: add some basic sanity checks on the returned data with pattern matching  
							
							 
							
							
							
						 
						
							2019-01-28 20:43:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								83b7062634 
								
							 
						 
						
							
							
								
								rich media: parser: cache negatives  
							
							 
							
							
							
						 
						
							2019-01-28 20:19:07 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8fb16e9f0f 
								
							 
						 
						
							
							
								
								rich media: parser: add copyright header  
							
							 
							
							
							
						 
						
							2019-01-28 20:00:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f53d464db0 
								
							 
						 
						
							
							
								
								Put deprecation warnings undre Pleroma.Config.  
							
							 
							
							
							
						 
						
							2019-01-28 14:39:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8e8a1e1ba8 
								
							 
						 
						
							
							
								
								Return new-style config if old-style config is set to false.  
							
							 
							
							... 
							
							
							
							This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well. 
							
						 
						
							2019-01-28 13:07:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f1d58c5c49 
								
							 
						 
						
							
							
								
								Don't run warnings in a task.  
							
							 
							
							
							
						 
						
							2019-01-28 13:05:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								de0fb88a9c 
								
							 
						 
						
							
							
								
								Merge branch 'safe-render-activities' into 'develop'  
							
							 
							
							... 
							
							
							
							remove unnecessary filter (re !723 )
See merge request pleroma/pleroma!729  
							
						 
						
							2019-01-28 11:48:03 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								df2f7b39dd 
								
							 
						 
						
							
							
								
								re  f83bae7c: remove unnecessary filter  
							
							 
							
							
							
						 
						
							2019-01-28 12:24:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f231313b70 
								
							 
						 
						
							
							
								
								Add deprecation warning mechanism.  
							
							 
							
							
							
						 
						
							2019-01-28 12:09:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1825118fd4 
								
							 
						 
						
							
							
								
								Correctly handle invalid credentials on auth login.  
							
							 
							
							... 
							
							
							
							Closes  #407  
							
						 
						
							2019-01-28 11:41:47 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ddc7ae2c1a 
								
							 
						 
						
							
							
								
								mastodon api: card: force OGP images through mediaproxy  
							
							 
							
							
							
						 
						
							2019-01-28 06:42:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ebeabdcc72 
								
							 
						 
						
							
							
								
								rich media: helpers: clean up unused aliases  
							
							 
							
							
							
						 
						
							2019-01-28 06:10:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								91ef64a1ec 
								
							 
						 
						
							
							
								
								activitypub: prime OGP crawler cache when new messages are inserted into the database  
							
							 
							
							
							
						 
						
							2019-01-28 06:07:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8e42251e06 
								
							 
						 
						
							
							
								
								rich media: add helpers module, use instead of MastodonAPI module  
							
							 
							
							
							
						 
						
							2019-01-28 06:04:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								24a103a1fe 
								
							 
						 
						
							
							
								
								mastodon api: formatting  
							
							 
							
							
							
						 
						
							2019-01-28 05:53:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6096846f5f 
								
							 
						 
						
							
							
								
								API: kill /api/rich_media/parse endpoint  
							
							 
							
							
							
						 
						
							2019-01-28 05:53:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								07a9a891ad 
								
							 
						 
						
							
							
								
								twitter api: fix up activity representer  
							
							 
							
							
							
						 
						
							2019-01-28 05:53:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								de42646634 
								
							 
						 
						
							
							
								
								rich media: add try/rescue to ensure we catch parsing and fetching failures  
							
							 
							
							
							
						 
						
							2019-01-28 05:53:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5d895093fd 
								
							 
						 
						
							
							
								
								twitter api: embed card in twitterapi posts  
							
							 
							
							
							
						 
						
							2019-01-28 05:53:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5a37ddc2dc 
								
							 
						 
						
							
							
								
								mastodon api: embed card in status object  
							
							 
							
							
							
						 
						
							2019-01-28 05:53:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								132d815f1f 
								
							 
						 
						
							
							
								
								mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data  
							
							 
							
							
							
						 
						
							2019-01-28 05:53:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71bb90073b 
								
							 
						 
						
							
							
								
								/notice/:id - send the FE index even if 404  
							
							 
							
							... 
							
							
							
							this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page 
							
						 
						
							2019-01-27 22:51:50 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								16ab1437d6 
								
							 
						 
						
							
							
								
								Merge branch 'safe-render-activities' into 'develop'  
							
							 
							
							... 
							
							
							
							Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723  
							
						 
						
							2019-01-27 20:10:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ea12371a01 
								
							 
						 
						
							
							
								
								Merge branch 'discard-invalid-likes' into 'develop'  
							
							 
							
							... 
							
							
							
							Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724  
							
						 
						
							2019-01-27 19:10:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77f2137383 
								
							 
						 
						
							
							
								
								Transmogrifier: fix incoming objects with invalid likes  
							
							 
							
							
							
						 
						
							2019-01-27 19:33:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f83bae7c22 
								
							 
						 
						
							
							
								
								Views: wrap activity rendering in a rescue  
							
							 
							
							... 
							
							
							
							this avoids complete timeline breakage when an activity fucks up
rendering. 
							
						 
						
							2019-01-27 19:16:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9af798ad40 
								
							 
						 
						
							
							
								
								Merge branch 'flake-random-worker-id' into 'develop'  
							
							 
							
							... 
							
							
							
							Flake: random worker id
See merge request pleroma/pleroma!721  
							
						 
						
							2019-01-27 15:16:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e0e0cc5ab0 
								
							 
						 
						
							
							
								
								Flake: random worker id  
							
							 
							
							
							
						 
						
							2019-01-27 16:04:36 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5eb81d2c72 
								
							 
						 
						
							
							
								
								Merge branch 'features/mastoapi-multi-hashtag' into 'develop'  
							
							 
							
							... 
							
							
							
							MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652  
							
						 
						
							2019-01-27 12:45:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a65c188593 
								
							 
						 
						
							
							
								
								Web.MastodonAPI.AccountView: Add is_moderator and is_admin  
							
							 
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/557  
							
						 
						
							2019-01-27 10:33:22 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								8f2f471e94 
								
							 
						 
						
							
							
								
								rich media: gracefully handle fetching nil URIs  
							
							 
							
							
							
						 
						
							2019-01-26 16:36:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								155a884300 
								
							 
						 
						
							
							
								
								Merge branch 'flake-from-int' into 'develop'  
							
							 
							
							... 
							
							
							
							Flake: support integers in from_string/1
See merge request pleroma/pleroma!715  
							
						 
						
							2019-01-26 16:17:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d6015338c8 
								
							 
						 
						
							
							
								
								Flake: support integers in from_string/1  
							
							 
							
							... 
							
							
							
							Some previously issued stateless tokens have integer ids in them. 
							
						 
						
							2019-01-26 16:58:23 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								3e66723f7e 
								
							 
						 
						
							
							
								
								Merge branch 'join-in-preloads' into 'develop'  
							
							 
							
							... 
							
							
							
							Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714  
							
						 
						
							2019-01-26 15:57:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								de956b9e04 
								
							 
						 
						
							
							
								
								Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it  
							
							 
							
							
							
						 
						
							2019-01-26 16:46:20 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1f7843b9b8 
								
							 
						 
						
							
							
								
								mastodon api: use OGP uri instead of page_url for deducing domain name, fix test  
							
							 
							
							
							
						 
						
							2019-01-26 15:24:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								86037e9c39 
								
							 
						 
						
							
							
								
								mastodon api: use HTML.extract_first_external_url()  
							
							 
							
							
							
						 
						
							2019-01-26 15:13:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8018ae7ae5 
								
							 
						 
						
							
							
								
								Join on preloads to avoid N+1 queries  
							
							 
							
							
							
						 
						
							2019-01-26 15:55:53 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								be9abb2cc5 
								
							 
						 
						
							
							
								
								html: add utility function to extract first URL from an object and cache the result  
							
							 
							
							
							
						 
						
							2019-01-26 14:55:12 +00:00